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

annotate libinterp/octave-value/ov-classdef.cc @ 26449:f8107140087c stable

maint: small indentation changes for readability. * ov-classdef.cc, ov-fcn-handle.cc: small indentation changes for readability.

author	Rik <rik@octave.org>
date	Sat, 05 Jan 2019 07:08:49 -0800
parents	00f796120a6d
children	0d3eca5955dc

rev	line source
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1 /*
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2
26376 00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 26119 diff changeset	3 Copyright (C) 2012-2019 Michael Goffioul
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	4
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	5 This file is part of Octave.
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	6
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24361 diff changeset	7 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	8 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24361 diff changeset	9 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	10 (at your option) any later version.
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	11
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	12 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	15 GNU General Public License for more details.
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	16
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	17 You should have received a copy of the GNU General Public License
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	18 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24361 diff changeset	19 <https://www.gnu.org/licenses/>.
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	20
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	21 */
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	22
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21578 diff changeset	23 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21200 diff changeset	24 # include "config.h"
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	25 #endif
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	26
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	27 #include <algorithm>
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	28
22091 0f6fc2ec3b1a move call_stack class to a separate file John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	29 #include "call-stack.h"
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	30 #include "defun.h"
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	31 #include "interpreter-private.h"
23127 5a91168a30be avoid including parse tree headers in other header files unnecessarily John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	32 #include "interpreter.h"
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	33 #include "load-path.h"
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	34 #include "ov-builtin.h"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	35 #include "ov-classdef.h"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	36 #include "ov-fcn-handle.h"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	37 #include "ov-typeinfo.h"
18263 b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	38 #include "ov-usr-fcn.h"
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	39 #include "pt-assign.h"
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	40 #include "pt-classdef.h"
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	41 #include "pt-eval.h"
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	42 #include "pt-funcall.h"
23127 5a91168a30be avoid including parse tree headers in other header files unnecessarily John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	43 #include "pt-idx.h"
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	44 #include "pt-misc.h"
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	45 #include "pt-stmt.h"
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	46 #include "pt-walk.h"
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	47 #include "symtab.h"
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	48
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	49 // Define to 1 to enable debugging statements.
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	50 #define DEBUG_TRACE 0
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	51
21040 3e7cfee5f786 maint: Rename attributes GCC_ATTR_XXX to OCTAVE_XXX. Rik <rik@octave.org> parents: 21029 diff changeset	52 OCTAVE_NORETURN static
21029 e3b3bb522d62 maint: Move GCC_ attributes to start of declaration for future compatibility. Rik <rik@octave.org> parents: 21017 diff changeset	53 void
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21055 diff changeset	54 err_method_access (const std::string& from, const cdef_method& meth)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	55 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	56 octave_value acc = meth.get ("Access");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	57 std::string acc_s;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	58
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	59 if (acc.is_string ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	60 acc_s = acc.string_value ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	61 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	62 acc_s = "class-restricted";
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	63
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	64 error ("%s: method `%s' has %s access and cannot be run in this context",
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	65 from.c_str (), meth.get_name ().c_str (), acc_s.c_str ());
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	66 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	67
21040 3e7cfee5f786 maint: Rename attributes GCC_ATTR_XXX to OCTAVE_XXX. Rik <rik@octave.org> parents: 21029 diff changeset	68 OCTAVE_NORETURN static
21029 e3b3bb522d62 maint: Move GCC_ attributes to start of declaration for future compatibility. Rik <rik@octave.org> parents: 21017 diff changeset	69 void
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21055 diff changeset	70 err_property_access (const std::string& from, const cdef_property& prop,
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22374 diff changeset	71 bool is_set = false)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	72 {
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	73 octave_value acc = (prop.get (is_set ? "SetAccess" : "GetAccess"));
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	74 std::string acc_s;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	75
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	76 if (acc.is_string ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	77 acc_s = acc.string_value ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	78 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	79 acc_s = "class-restricted";
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	80
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	81 if (is_set)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	82 error ("%s: property `%s' has %s access and cannot be set in this context",
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	83 from.c_str (), prop.get_name ().c_str (), acc_s.c_str ());
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	84 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	85 error ("%s: property `%s' has %s access and cannot be obtained in this context",
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	86 from.c_str (), prop.get_name ().c_str (), acc_s.c_str ());
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	87 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	88
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	89 static std::string
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	90 get_base_name (const std::string& nm)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	91 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	92 std::string::size_type pos = nm.find_last_of ('.');
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	93
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	94 if (pos != std::string::npos)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	95 return nm.substr (pos + 1);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	96
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	97 return nm;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	98 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	99
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	100 static void
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	101 make_function_of_class (const std::string& class_name,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	102 const octave_value& fcn)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	103 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	104 octave_function *of = fcn.function_value ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	105
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	106 of->stash_dispatch_class (class_name);
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	107
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	108 octave_user_function *uf = of->user_function_value (true);
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	109
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	110 if (uf)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	111 {
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	112 if (get_base_name (class_name) == uf->name ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	113 {
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	114 uf->mark_as_class_constructor ();
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	115 uf->mark_as_classdef_constructor ();
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	116 }
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	117 else
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	118 uf->mark_as_class_method ();
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	119 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	120 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	121
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	122 static void
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	123 make_function_of_class (const cdef_class& cls, const octave_value& fcn)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	124 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	125 make_function_of_class (cls.get_name (), fcn);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	126 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	127
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	128 static octave_value
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	129 make_fcn_handle (octave_builtin::fcn ff, const std::string& nm)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	130 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	131 octave_value fcn (new octave_builtin (ff, nm));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	132
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	133 octave_value fcn_handle (new octave_fcn_handle (fcn, nm));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	134
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	135 return fcn_handle;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	136 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	137
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	138 static octave_value
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	139 make_fcn_handle (const octave_value& fcn, const std::string& nm)
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	140 {
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	141 octave_value retval;
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	142
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	143 if (fcn.is_defined ())
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	144 retval = octave_value (new octave_fcn_handle (fcn, nm));
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	145
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	146 return retval;
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	147 }
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	148
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	149 static cdef_class
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	150 lookup_class (const std::string& name, bool error_if_not_found = true,
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	151 bool load_if_not_found = true)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	152 {
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	153 cdef_manager& cdm = octave::__get_cdef_manager__ ("lookup_class");
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	154
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	155 return cdm.find_class (name, error_if_not_found, load_if_not_found);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	156 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	157
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	158 static cdef_class
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	159 lookup_class (const cdef_class& cls)
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	160 {
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	161 // FIXME: placeholder for the time being, the purpose
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	162 // is to centralized any class update activity here.
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	163
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	164 return cls;
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	165 }
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	166
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	167 static cdef_class
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	168 lookup_class (const octave_value& ov)
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	169 {
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	170 if (ov.is_string())
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	171 return lookup_class (ov.string_value ());
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	172 else
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	173 {
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	174 cdef_class cls (to_cdef (ov));
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	175
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	176 return lookup_class (cls);
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	177 }
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	178
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	179 return cdef_class ();
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	180 }
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	181
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	182 static std::list<cdef_class>
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	183 lookup_classes (const Cell& cls_list)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	184 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	185 std::list<cdef_class> retval;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	186
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	187 for (int i = 0; i < cls_list.numel (); i++)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	188 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	189 cdef_class c = lookup_class (cls_list(i));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	190
20678 4b00afb5e9c3 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20580 diff changeset	191 retval.push_back (c);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	192 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	193
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	194 return retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	195 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	196
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	197 static octave_value
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	198 to_ov (const std::list<cdef_class>& class_list)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	199 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	200 Cell cls (class_list.size (), 1);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	201 int i = 0;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	202
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	203 for (const auto& cdef_cls : class_list)
22991 53bb781d70c0 Fix regression in multiple inheritance from cset 50495eeb5df1 (bug #49973). Rik <rik@octave.org> parents: 22898 diff changeset	204 cls(i++) = to_ov (cdef_cls);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	205
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	206 return octave_value (cls);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	207 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	208
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	209 static bool
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	210 is_superclass (const cdef_class& clsa, const cdef_class& clsb,
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	211 bool allow_equal = true, int max_depth = -1)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	212 {
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	213 bool retval = false;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	214
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	215 if (allow_equal && clsa == clsb)
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	216 retval = true;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	217 else if (max_depth != 0)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	218 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	219 Cell c = clsb.get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	220
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	221 for (int i = 0; ! retval && i < c.numel (); i++)
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	222 {
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	223 cdef_class cls = lookup_class (c(i));
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	224
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	225 retval = is_superclass (clsa, cls, true,
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	226 max_depth < 0 ? max_depth : max_depth-1);
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	227 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	228 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	229
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	230 return retval;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	231 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	232
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	233 inline bool
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	234 is_strict_superclass (const cdef_class& clsa, const cdef_class& clsb)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	235 { return is_superclass (clsa, clsb, false); }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	236
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	237 inline bool
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	238 is_direct_superclass (const cdef_class& clsa, const cdef_class& clsb)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	239 { return is_superclass (clsa, clsb, false, 1); }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	240
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	241 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	242 class_get_properties (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	243 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	244 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	245
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	246 if (args.length () == 1 && args(0).type_name () == "object")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	247 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	248 cdef_class cls (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	249
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	250 retval(0) = cls.get_properties ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	251 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	252
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	253 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	254 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	255
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	256 static cdef_class
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	257 get_class_context (std::string& name, bool& in_constructor)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	258 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	259 cdef_class cls;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	260
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23534 diff changeset	261 octave::call_stack& cs = octave::__get_call_stack__ ("get_class_context");
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23534 diff changeset	262
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23534 diff changeset	263 octave_function *fcn = cs.current ();
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	264
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	265 in_constructor = false;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	266
19864 17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	267 if (fcn && (fcn->is_class_method ()
17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	268 \|\| fcn->is_classdef_constructor ()
17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	269 \|\| fcn->is_anonymous_function_of_class ()
17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	270 \|\| (fcn->is_private_function ()
17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	271 && ! fcn->dispatch_class ().empty ())))
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	272 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	273 cls = lookup_class (fcn->dispatch_class ());
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	274
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	275 name = fcn->name ();
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	276 in_constructor = fcn->is_classdef_constructor ();
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	277 }
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	278
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	279 return cls;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	280 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	281
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	282 inline cdef_class
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	283 get_class_context (void)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	284 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	285 std::string dummy_string;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	286 bool dummy_bool;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	287
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	288 return get_class_context (dummy_string, dummy_bool);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	289 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	290
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	291 static bool
18314 06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	292 in_class_method (const cdef_class& cls)
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	293 {
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	294 cdef_class ctx = get_class_context ();
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	295
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	296 return (ctx.ok () && is_superclass (ctx, cls));
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	297 }
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	298
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	299 static bool
18305 81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	300 check_access (const cdef_class& cls, const octave_value& acc,
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20979 diff changeset	301 const std::string& meth_name = "",
93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20979 diff changeset	302 const std::string& prop_name = "",
18305 81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	303 bool is_prop_set = false)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	304 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	305 if (acc.is_string ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	306 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	307 std::string acc_s = acc.string_value ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	308
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	309 if (acc_s == "public")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	310 return true;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	311
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	312 cdef_class ctx = get_class_context ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	313
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	314 // The access is private or protected, this requires a
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	315 // valid class context.
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	316
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	317 if (ctx.ok ())
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	318 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	319 if (acc_s == "private")
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	320 return (ctx == cls);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	321 else if (acc_s == "protected")
18305 81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	322 {
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	323 if (is_superclass (cls, ctx))
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	324 // Calling a protected method in a superclass.
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	325 return true;
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	326 else if (is_strict_superclass (ctx, cls))
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	327 {
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	328 // Calling a protected method or property in a derived class.
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	329 // This is only allowed if the context class knows about it
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	330 // and has access to it.
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	331
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	332 if (! meth_name.empty ())
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	333 {
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	334 cdef_method m = ctx.find_method (meth_name);
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	335
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	336 if (m.ok ())
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	337 return check_access (ctx, m.get ("Access"), meth_name);
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	338
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	339 return false;
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	340 }
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	341 else if (! prop_name.empty ())
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	342 {
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	343 cdef_property p = ctx.find_property (prop_name);
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	344
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	345 if (p.ok ())
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	346 {
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	347 octave_value p_access = p.get (is_prop_set ?
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	348 "SetAccess" :
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	349 "GetAccess");
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	350
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	351 return check_access (ctx, p_access, meth_name,
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	352 prop_name, is_prop_set);
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	353 }
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	354
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	355 return false;
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	356 }
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	357 else
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	358 panic_impossible ();
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	359 }
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	360
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	361 return false;
81c1edd70bfd Allow base classes to access protected members of derived classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 18263 diff changeset	362 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	363 else
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	364 panic_impossible ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	365 }
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	366 }
25221 22ece7843499 Allow a single metaclass for Access property of classdef objects (bug #53601) Rik <rik@octave.org> parents: 25054 diff changeset	367 else if (acc.isobject ())
22ece7843499 Allow a single metaclass for Access property of classdef objects (bug #53601) Rik <rik@octave.org> parents: 25054 diff changeset	368 {
22ece7843499 Allow a single metaclass for Access property of classdef objects (bug #53601) Rik <rik@octave.org> parents: 25054 diff changeset	369 cdef_class ctx = get_class_context ();
22ece7843499 Allow a single metaclass for Access property of classdef objects (bug #53601) Rik <rik@octave.org> parents: 25054 diff changeset	370
22ece7843499 Allow a single metaclass for Access property of classdef objects (bug #53601) Rik <rik@octave.org> parents: 25054 diff changeset	371 // At this point, a class context is always required.
22ece7843499 Allow a single metaclass for Access property of classdef objects (bug #53601) Rik <rik@octave.org> parents: 25054 diff changeset	372 if (ctx.ok ())
22ece7843499 Allow a single metaclass for Access property of classdef objects (bug #53601) Rik <rik@octave.org> parents: 25054 diff changeset	373 {
22ece7843499 Allow a single metaclass for Access property of classdef objects (bug #53601) Rik <rik@octave.org> parents: 25054 diff changeset	374 if (ctx == cls)
22ece7843499 Allow a single metaclass for Access property of classdef objects (bug #53601) Rik <rik@octave.org> parents: 25054 diff changeset	375 return true;
22ece7843499 Allow a single metaclass for Access property of classdef objects (bug #53601) Rik <rik@octave.org> parents: 25054 diff changeset	376
22ece7843499 Allow a single metaclass for Access property of classdef objects (bug #53601) Rik <rik@octave.org> parents: 25054 diff changeset	377 cdef_class acc_cls (to_cdef (acc));
22ece7843499 Allow a single metaclass for Access property of classdef objects (bug #53601) Rik <rik@octave.org> parents: 25054 diff changeset	378
22ece7843499 Allow a single metaclass for Access property of classdef objects (bug #53601) Rik <rik@octave.org> parents: 25054 diff changeset	379 if (is_superclass (acc_cls, ctx))
22ece7843499 Allow a single metaclass for Access property of classdef objects (bug #53601) Rik <rik@octave.org> parents: 25054 diff changeset	380 return true;
22ece7843499 Allow a single metaclass for Access property of classdef objects (bug #53601) Rik <rik@octave.org> parents: 25054 diff changeset	381 }
22ece7843499 Allow a single metaclass for Access property of classdef objects (bug #53601) Rik <rik@octave.org> parents: 25054 diff changeset	382 }
23576 00e518162fda maint: Deprecate is_cell and replace with iscell. Rik <rik@octave.org> parents: 23553 diff changeset	383 else if (acc.iscell ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	384 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	385 Cell acc_c = acc.cell_value ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	386
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	387 cdef_class ctx = get_class_context ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	388
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	389 // At this point, a class context is always required.
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	390
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	391 if (ctx.ok ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	392 {
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	393 if (ctx == cls)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	394 return true;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	395
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	396 for (int i = 0; i < acc.numel (); i++)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	397 {
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	398 cdef_class acc_cls (to_cdef (acc_c(i)));
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	399
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	400 if (is_superclass (acc_cls, ctx))
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	401 return true;
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	402 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	403 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	404 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	405 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	406 error ("invalid property/method access in class `%s'",
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	407 cls.get_name ().c_str ());
19597 db92e7e28e1f strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19343 diff changeset	408
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	409 return false;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	410 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	411
18263 b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	412 static bool
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	413 is_dummy_method (const octave_value& fcn)
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	414 {
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	415 bool retval = false;
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	416
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	417 if (fcn.is_defined ())
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	418 {
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	419 if (fcn.is_user_function ())
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	420 {
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	421 octave_user_function *uf = fcn.user_function_value (true);
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	422
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	423 if (! uf \|\| ! uf->body ())
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	424 retval = true;
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	425 }
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	426 }
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	427 else
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	428 retval = true;
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	429
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	430 return retval;
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	431 }
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	432
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	433 static bool
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	434 is_method_executing (const octave_value& ov, const cdef_object& obj)
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	435 {
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23503 diff changeset	436 octave::tree_evaluator& tw
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23503 diff changeset	437 = octave::__get_evaluator__ ("is_method_executing");
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	438
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23534 diff changeset	439 octave::call_stack& cs = octave::__get_call_stack__ ("is_method_executing");
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23534 diff changeset	440
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23534 diff changeset	441 octave_function *stack_fcn = cs.current ();
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23445 diff changeset	442
c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23445 diff changeset	443 octave_function *method_fcn = ov.function_value (true);
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	444
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	445 // Does the top of the call stack match our target function?
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	446
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	447 if (stack_fcn && stack_fcn == method_fcn)
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	448 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23445 diff changeset	449 octave_user_function *uf = method_fcn->user_function_value (true);
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	450
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	451 // We can only check the context object for user-function (not builtin),
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	452 // where we have access to the parameters (arguments and return values).
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	453 // That's ok as there's no need to call this function for builtin
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	454 // methods.
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	455
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	456 if (uf)
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	457 {
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	458 // At this point, the method is executing, but we still need to
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21724 diff changeset	459 // check the context object for which the method is executing. For
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	460 // methods, it's the first argument of the function; for ctors, it
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	461 // is the first return value.
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	462
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23445 diff changeset	463 octave::tree_parameter_list *pl = uf->is_classdef_constructor ()
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	464 ? uf->return_list () : uf->parameter_list ();
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	465
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	466 if (pl && pl->size () > 0)
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	467 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	468 octave::tree_decl_elt *elt = pl->front ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	469
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23503 diff changeset	470 octave_value arg0 = tw.evaluate (elt);
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	471
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	472 if (arg0.is_defined () && arg0.type_name () == "object")
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	473 {
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	474 cdef_object arg0_obj = to_cdef (arg0);
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	475
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	476 return obj.is (arg0_obj);
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	477 }
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	478 }
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	479 }
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	480 }
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	481
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	482 return false;
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	483 }
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	484
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	485 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	486 class_get_methods (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	487 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	488 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	489
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	490 if (args.length () == 1 && args(0).type_name () == "object")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	491 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	492 cdef_class cls (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	493
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	494 retval(0) = cls.get_methods ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	495 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	496
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	497 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	498 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	499
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	500 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	501 class_get_superclasses (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	502 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	503 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	504
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	505 if (args.length () == 1 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	506 && args(0).class_name () == "meta.class")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	507 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	508 cdef_class cls (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	509
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	510 Cell classes = cls.get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	511
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	512 retval(0) = to_ov (lookup_classes (classes));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	513 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	514
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	515 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	516 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	517
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	518 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	519 class_get_inferiorclasses (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	520 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	521 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	522
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	523 if (args.length () == 1 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	524 && args(0).class_name () == "meta.class")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	525 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	526 cdef_class cls (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	527
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	528 Cell classes = cls.get ("InferiorClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	529
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	530 retval(0) = to_ov (lookup_classes (classes));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	531 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	532
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	533 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	534 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	535
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	536 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	537 class_fromName (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	538 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	539 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	540
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	541 if (args.length () != 1)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	542 error ("fromName: invalid number of parameters");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	543
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	544 std::string name = args(0).xstring_value ("fromName: CLASS_NAME must be a string");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	545
24100 4d9ceaf17dda return empty matrix if meta..fromName fails (bug #52096) Piotr Held <pjheld@gmail.com>* parents: 23865 diff changeset	546 retval(0) = to_ov (lookup_class (name, false));
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	547
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	548 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	549 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	550
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	551 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	552 class_fevalStatic (const octave_value_list& args, int nargout)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	553 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	554 if (args.length () <= 1 \|\| args(0).type_name () != "object")
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	555 error ("fevalStatic: first argument must be a meta.class object");
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	556
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	557 cdef_class cls (to_cdef (args(0)));
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	558
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	559 std::string meth_name = args(1).xstring_value ("fevalStatic: method name must be a string");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	560
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	561 cdef_method meth = cls.find_method (meth_name);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	562
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	563 if (! meth.ok ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	564 error ("fevalStatic: method not found: %s", meth_name.c_str ());
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	565
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	566 if (! meth.is_static ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	567 error ("fevalStatic: method `%s' is not static", meth_name.c_str ());
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	568
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	569 return meth.execute (args.splice (0, 2), nargout, true, "fevalStatic");
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	570 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	571
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	572 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	573 class_getConstant (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	574 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	575 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	576
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	577 if (args.length () != 2 \|\| args(0).type_name () != "object"
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	578 \|\| args(0).class_name () != "meta.class")
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	579 error ("getConstant: first argument must be a meta.class object");
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	580
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	581 cdef_class cls = to_cdef (args(0));
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	582
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	583 std::string prop_name = args(1).xstring_value ("getConstant: property name must be a string");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	584
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	585 cdef_property prop = cls.find_property (prop_name);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	586
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	587 if (! prop.ok ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	588 error ("getConstant: property not found: %s",
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	589 prop_name.c_str ());
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	590
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	591 if (! prop.is_constant ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	592 error ("getConstant: property `%s' is not constant",
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	593 prop_name.c_str ());
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	594
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	595 retval(0) = prop.get_value (true, "getConstant");
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	596
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	597 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	598 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	599
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	600 #define META_CLASS_CMP(OP, CLSA, CLSB, FUN) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	601 static octave_value_list \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	602 class_ ## OP (const octave_value_list& args, int /* nargout */) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	603 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	604 octave_value_list retval; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	605 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	606 if (args.length () != 2 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	607 \|\| args(0).type_name () != "object" \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	608 \|\| args(1).type_name () != "object" \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	609 \|\| args(0).class_name () != "meta.class" \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	610 \|\| args(1).class_name () != "meta.class") \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	611 error (#OP ": invalid arguments"); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	612 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	613 cdef_class clsa = to_cdef (args(0)); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	614 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	615 cdef_class clsb = to_cdef (args(1)); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	616 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	617 retval(0) = FUN (CLSA, CLSB); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	618 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	619 return retval; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	620 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	621
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	622 META_CLASS_CMP (lt, clsb, clsa, is_strict_superclass)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	623 META_CLASS_CMP (le, clsb, clsa, is_superclass)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	624 META_CLASS_CMP (gt, clsa, clsb, is_strict_superclass)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	625 META_CLASS_CMP (ge, clsa, clsb, is_superclass)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	626 META_CLASS_CMP (eq, clsa, clsb, operator==)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	627 META_CLASS_CMP (ne, clsa, clsb, operator!=)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	628
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	629 octave_value_list
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	630 property_get_defaultvalue (const octave_value_list& args, int /* nargout */)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	631 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	632 octave_value_list retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	633
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	634 if (args.length () == 1 && args(0).type_name () == "object")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	635 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	636 cdef_property prop (to_cdef (args(0)));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	637
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	638 retval(0) = prop.get ("DefaultValue");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	639
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	640 if (! retval(0).is_defined ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	641 error_with_id ("Octave:class:NotDefaultDefined",
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	642 "no default value for property `%s'",
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	643 prop.get_name ().c_str ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	644 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	645
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	646 return retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	647 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	648
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	649 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	650 handle_delete (const octave_value_list& /* args /, int / nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	651 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	652 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	653
25367 0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	654 // FIXME: implement this. Wait, what is this supposed to do?
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	655
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	656 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	657 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	658
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	659 cdef_class
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	660 cdef_manager::make_class (const std::string& name,
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	661 const std::list<cdef_class>& super_list)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	662 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	663 cdef_class cls (name, super_list);
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	664
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	665 cls.set_class (meta_class ());
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	666
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	667 cls.put ("Abstract", false);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	668 cls.put ("ConstructOnLoad", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	669 cls.put ("ContainingPackage", Matrix ());
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20979 diff changeset	670 cls.put ("Description", "");
93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20979 diff changeset	671 cls.put ("DetailedDescription", "");
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	672 cls.put ("Events", Cell ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	673 cls.put ("Hidden", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	674 cls.put ("InferiorClasses", Cell ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	675 cls.put ("Methods", Cell ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	676 cls.put ("Properties", Cell ());
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	677 cls.put ("Sealed", false);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	678
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	679 if (name == "handle")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	680 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	681 cls.put ("HandleCompatible", true);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	682 cls.mark_as_handle_class ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	683 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	684 else if (super_list.empty ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	685 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	686 cls.put ("HandleCompatible", false);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	687 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	688 else
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	689 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	690 bool all_handle_compatible = true;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	691 bool has_handle_class = false;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	692
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	693 for (const auto& cl : super_list)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	694 {
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	695 all_handle_compatible = all_handle_compatible
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	696 && cl.get ("HandleCompatible").bool_value ();
50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	697 has_handle_class = has_handle_class \|\| cl.is_handle_class ();
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	698 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	699
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	700 if (has_handle_class && ! all_handle_compatible)
20428 7ac907da9fba Use error() rather than ::error() unless explicitly required. Rik <rik@octave.org> parents: 20193 diff changeset	701 error ("%s: cannot mix handle and non-HandleCompatible classes",
7ac907da9fba Use error() rather than ::error() unless explicitly required. Rik <rik@octave.org> parents: 20193 diff changeset	702 name.c_str ());
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	703
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	704 cls.put ("HandleCompatible", all_handle_compatible);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	705 if (has_handle_class)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	706 cls.mark_as_handle_class ();
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	707 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	708
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	709 if (! name.empty ())
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	710 register_class (cls);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	711
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	712 return cls;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	713 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	714
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	715 cdef_class
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	716 cdef_manager::make_class (const std::string& name,
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	717 const cdef_class& super)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	718 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	719 return make_class (name, std::list<cdef_class> (1, super));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	720 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	721
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	722 cdef_class
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	723 cdef_manager::make_meta_class (const std::string& name,
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	724 const cdef_class& super)
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	725 {
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	726 cdef_class cls = make_class (name, super);
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	727
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	728 cls.put ("Sealed", true);
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	729 cls.mark_as_meta_class ();
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	730
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	731 return cls;
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	732 }
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	733
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	734 cdef_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	735 cdef_manager::make_property (const cdef_class& cls, const std::string& name,
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	736 const octave_value& get_method,
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	737 const std::string& get_access,
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	738 const octave_value& set_method,
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	739 const std::string& set_access)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	740 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	741 cdef_property prop (name);
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	742
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	743 prop.set_class (meta_property ());
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	744
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20979 diff changeset	745 prop.put ("Description", "");
93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20979 diff changeset	746 prop.put ("DetailedDescription", "");
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	747 prop.put ("Abstract", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	748 prop.put ("Constant", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	749 prop.put ("GetAccess", get_access);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	750 prop.put ("SetAccess", set_access);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	751 prop.put ("Dependent", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	752 prop.put ("Transient", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	753 prop.put ("Hidden", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	754 prop.put ("GetObservable", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	755 prop.put ("SetObservable", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	756 prop.put ("GetMethod", get_method);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	757 prop.put ("SetMethod", set_method);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	758 prop.put ("DefiningClass", to_ov (cls));
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	759 prop.put ("DefaultValue", octave_value ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	760 prop.put ("HasDefault", false);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	761
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	762 std::string class_name = cls.get_name ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	763
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23576 diff changeset	764 if (! get_method.isempty ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	765 make_function_of_class (class_name, get_method);
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23576 diff changeset	766 if (! set_method.isempty ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	767 make_function_of_class (class_name, set_method);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	768
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	769 return prop;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	770 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	771
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	772 cdef_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	773 cdef_manager::make_attribute (const cdef_class& cls, const std::string& name)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	774 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	775 return make_property (cls, name, Matrix (), "public", Matrix (), "private");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	776 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	777
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	778 cdef_method
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	779 cdef_manager::make_method (const cdef_class& cls, const std::string& name,
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	780 const octave_value& fcn,
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	781 const std::string& m_access, bool is_static)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	782 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	783 cdef_method meth (name);
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	784
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	785 meth.set_class (meta_method ());
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	786
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	787 meth.put ("Abstract", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	788 meth.put ("Access", m_access);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	789 meth.put ("DefiningClass", to_ov (cls));
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20979 diff changeset	790 meth.put ("Description", "");
93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20979 diff changeset	791 meth.put ("DetailedDescription", "");
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	792 meth.put ("Hidden", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	793 meth.put ("Sealed", true);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	794 meth.put ("Static", is_static);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	795
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	796 if (fcn.is_defined ())
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	797 make_function_of_class (cls, fcn);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	798
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	799 meth.set_function (fcn);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	800
18263 b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	801 if (is_dummy_method (fcn))
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	802 meth.mark_as_external (cls.get_name ());
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	803
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	804 return meth;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	805 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	806
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	807 cdef_method
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	808 cdef_manager::make_method (const cdef_class& cls, const std::string& name,
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	809 octave_builtin::fcn ff,
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	810 const std::string& m_access, bool is_static)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	811 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	812 octave_value fcn (new octave_builtin (ff, name));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	813
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	814 return make_method (cls, name, fcn, m_access, is_static);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	815 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	816
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	817 cdef_method
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	818 cdef_manager::make_method (const cdef_class& cls, const std::string& name,
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	819 octave_builtin::meth mm,
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	820 const std::string& m_access, bool is_static)
23533 8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	821 {
8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	822 octave_value fcn (new octave_builtin (mm, name));
8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	823
8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	824 return make_method (cls, name, fcn, m_access, is_static);
8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	825 }
8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	826
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	827 cdef_package
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	828 cdef_manager::make_package (const std::string& nm, const std::string& parent)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	829 {
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	830 cdef_package pack (nm);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	831
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	832 pack.set_class (meta_package ());
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	833
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	834 if (parent.empty ())
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	835 pack.put ("ContainingPackage", Matrix ());
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	836 else
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	837 pack.put ("ContainingPackage", to_ov (find_package (parent)));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	838
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	839 if (! nm.empty ())
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	840 register_package (pack);
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	841
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	842 return pack;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	843 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	844
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	845 //----------------------------------------------------------------------------
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	846
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	847 int octave_classdef::t_id (-1);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	848
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	849 const std::string octave_classdef::t_name ("object");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	850
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	851 void
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24539 diff changeset	852 octave_classdef::register_type (octave::type_info& ti)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	853 {
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24539 diff changeset	854 t_id = ti.register_type (octave_classdef::t_name, "<unknown>",
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24539 diff changeset	855 octave_value (new octave_classdef ()));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	856 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	857
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	858 octave_value_list
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	859 octave_classdef::subsref (const std::string& type,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	860 const std::list<octave_value_list>& idx,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	861 int nargout)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	862 {
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	863 size_t skip = 0;
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	864 octave_value_list retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	865
18314 06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	866 cdef_class cls = object.get_class ();
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	867
26041 920a4ad8043b remove called_from_builtin John W. Eaton <jwe@octave.org> parents: 25377 diff changeset	868 if (! in_class_method (cls))
18314 06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	869 {
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	870 cdef_method meth = cls.find_method ("subsref");
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	871
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	872 if (meth.ok ())
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	873 {
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	874 octave_value_list args;
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	875
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	876 args(1) = make_idx_args (type, idx, "subsref");
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	877
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	878 count++;
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	879 args(0) = octave_value (this);
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	880
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	881 retval = meth.execute (args, nargout, true, "subsref");
18314 06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	882
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	883 return retval;
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	884 }
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	885 }
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	886
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	887 // At this point, the default subsref mechanism must be used.
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	888
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	889 retval = object.subsref (type, idx, nargout, skip, cdef_class ());
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	890
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	891 if (type.length () > skip && idx.size () > skip)
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	892 retval = retval(0).next_subsref (nargout, type, idx, skip);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	893
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	894 return retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	895 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	896
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	897 octave_value
16696 665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	898 octave_classdef::subsref (const std::string& type,
665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	899 const std::list<octave_value_list>& idx,
665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	900 bool auto_add)
665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	901 {
665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	902 size_t skip = 0;
665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	903 octave_value_list retval;
665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	904
18314 06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	905 // This variant of subsref is used to create temporary values when doing
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21724 diff changeset	906 // assignment with multi-level indexing. AFAIK this is only used for internal
18314 06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	907 // purpose (not sure we should even implement this) and any overload subsref
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	908 // should not be called.
16696 665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	909
665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	910 retval = object.subsref (type, idx, 1, skip, cdef_class (), auto_add);
665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	911
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	912 if (type.length () > skip && idx.size () > skip)
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	913 retval = retval(0).next_subsref (1, type, idx, skip);
16696 665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	914
665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	915 return retval.length () > 0 ? retval(0) : octave_value ();
665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	916 }
665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	917
665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	918 octave_value
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	919 octave_classdef::subsasgn (const std::string& type,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	920 const std::list<octave_value_list>& idx,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	921 const octave_value& rhs)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	922 {
18382 6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	923 octave_value retval;
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	924
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	925 cdef_class cls = object.get_class ();
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	926
26041 920a4ad8043b remove called_from_builtin John W. Eaton <jwe@octave.org> parents: 25377 diff changeset	927 if (! in_class_method (cls))
18382 6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	928 {
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	929 cdef_method meth = cls.find_method ("subsasgn");
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	930
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	931 if (meth.ok ())
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	932 {
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	933 octave_value_list args;
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	934
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	935 args(1) = make_idx_args (type, idx, "subsasgn");
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	936
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	937 count++;
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	938 args(0) = octave_value (this);
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	939 args(2) = rhs;
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	940
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	941 octave_value_list retlist;
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	942
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	943 retlist = meth.execute (args, 1, true, "subsasgn");
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	944
21885 0806871e3e1e maint: Prefer is_empty() rather than "length () == 0". Rik <rik@octave.org> parents: 21751 diff changeset	945 if (retlist.empty ())
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	946 error ("overloaded method `subsasgn' did not return any value");
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	947
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	948 retval = retlist(0);
18382 6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	949 }
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	950 }
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	951
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	952 if (! retval.is_defined ())
18382 6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	953 retval = object.subsasgn (type, idx, rhs);
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	954
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	955 return retval;
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	956 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	957
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	958 octave_value
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	959 octave_classdef::undef_subsasgn (const std::string& type,
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	960 const std::list<octave_value_list>& idx,
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	961 const octave_value& rhs)
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	962 {
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	963 if (type.length () == 1 && type[0] == '(')
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	964 {
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	965 object = object.make_array ();
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	966
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	967 return subsasgn (type, idx, rhs);
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	968 }
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	969 else
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	970 return octave_base_value::undef_subsasgn (type, idx, rhs);
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	971
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	972 return octave_value ();
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	973 }
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	974
24802 7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	975 octave_idx_type
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	976 octave_classdef::numel (const octave_value_list& idx)
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	977 {
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	978 octave_idx_type retval = -1;
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	979
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	980 cdef_class cls = object.get_class ();
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	981
26041 920a4ad8043b remove called_from_builtin John W. Eaton <jwe@octave.org> parents: 25377 diff changeset	982 if (! in_class_method (cls))
24802 7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	983 {
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	984 cdef_method meth = cls.find_method ("numel");
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	985
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	986 if (meth.ok ())
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	987 {
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	988 octave_value_list args (idx.length () + 1, octave_value ());
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	989
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	990 count++;
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	991 args(0) = octave_value (this);
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	992
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	993 for (octave_idx_type i = 0; i < idx.length (); i++)
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	994 args(i+1) = idx(i);
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	995
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	996 octave_value_list lv = meth.execute (args, 1, true, "numel");
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	997 if (lv.length () != 1 \|\| ! lv(0).is_scalar_type ())
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	998 error ("@%s/numel: invalid return value", cls.get_name ().c_str ());
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	999
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	1000 retval = lv(0).idx_type_value (true);
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	1001
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	1002 return retval;
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	1003 }
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	1004 }
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	1005
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	1006 retval = octave_base_value::numel (idx);
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	1007
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	1008 return retval;
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	1009 }
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	1010
18416 bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1011 void
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1012 octave_classdef::print (std::ostream& os, bool)
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1013 {
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1014 print_raw (os);
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1015 }
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1016
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1017 void
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1018 octave_classdef::print_raw (std::ostream& os, bool) const
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1019 {
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1020 indent (os);
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1021 os << "<object ";
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1022 if (object.is_array ())
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1023 os << "array ";
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23693 diff changeset	1024 os << class_name () << '>';
18416 bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1025 newline (os);
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1026 }
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1027
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1028 bool
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1029 octave_classdef::print_name_tag (std::ostream& os,
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1030 const std::string& name) const
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1031 {
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1032 return octave_base_value::print_name_tag (os, name);
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1033 }
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1034
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1035 void
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1036 octave_classdef::print_with_name (std::ostream& os, const std::string& name,
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1037 bool print_padding)
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1038 {
22898 9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22871 diff changeset	1039 octave_base_value::print_with_name (os, name, print_padding);
18416 bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1040 }
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1041
19103 56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19031 diff changeset	1042 bool
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19031 diff changeset	1043 octave_classdef::is_instance_of (const std::string& cls_name) const
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19031 diff changeset	1044 {
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19031 diff changeset	1045 cdef_class cls = lookup_class (cls_name, false, false);
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19031 diff changeset	1046
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19031 diff changeset	1047 if (cls.ok ())
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19031 diff changeset	1048 return is_superclass (cls, object.get_class ());
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19031 diff changeset	1049
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19031 diff changeset	1050 return false;
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19031 diff changeset	1051 }
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19031 diff changeset	1052
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1053 //----------------------------------------------------------------------------
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1054
15986 14aa0b5a980c Abstract the meta-protocol layer to use it for other meta objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 15968 diff changeset	1055 class octave_classdef_meta : public octave_function
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1056 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1057 public:
15986 14aa0b5a980c Abstract the meta-protocol layer to use it for other meta objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 15968 diff changeset	1058 octave_classdef_meta (const cdef_meta_object& obj)
14aa0b5a980c Abstract the meta-protocol layer to use it for other meta objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 15968 diff changeset	1059 : object (obj) { }
14aa0b5a980c Abstract the meta-protocol layer to use it for other meta objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 15968 diff changeset	1060
25321 089852fc8929 use explict default and deleted ctors and dtors for classdef classes John W. Eaton <jwe@octave.org> parents: 25320 diff changeset	1061 octave_classdef_meta (const octave_classdef_meta&) = delete;
089852fc8929 use explict default and deleted ctors and dtors for classdef classes John W. Eaton <jwe@octave.org> parents: 25320 diff changeset	1062
089852fc8929 use explict default and deleted ctors and dtors for classdef classes John W. Eaton <jwe@octave.org> parents: 25320 diff changeset	1063 octave_classdef_meta& operator = (const octave_classdef_meta&) = delete;
089852fc8929 use explict default and deleted ctors and dtors for classdef classes John W. Eaton <jwe@octave.org> parents: 25320 diff changeset	1064
15986 14aa0b5a980c Abstract the meta-protocol layer to use it for other meta objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 15968 diff changeset	1065 ~octave_classdef_meta (void)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1066 { object.meta_release (); }
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1067
23683 ffd27f53fc79 make +package function calls work again (bug #51295, #51296) John W. Eaton <jwe@octave.org> parents: 23666 diff changeset	1068 bool is_classdef_meta (void) const { return true; }
23843 a52eb3f210af maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23838 diff changeset	1069
23838 6e0fd7e3c262 Fix argument lookup in '+' package functions (Bug #51532). Piotr Held <pjheld@gmail.com> parents: 23829 diff changeset	1070 bool is_package (void) const { return object.is_package(); }
23683 ffd27f53fc79 make +package function calls work again (bug #51295, #51296) John W. Eaton <jwe@octave.org> parents: 23666 diff changeset	1071
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23445 diff changeset	1072 octave_function * function_value (bool = false) { return this; }
15955 837a4a9b5049 Support constructor call with no indexing syntax. Michael Goffioul <michael.goffioul@gmail.com> parents: 15913 diff changeset	1073
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1074 octave_value_list
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1075 subsref (const std::string& type,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1076 const std::list<octave_value_list>& idx,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1077 int nargout)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1078 {
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23503 diff changeset	1079 return object.meta_subsref (type, idx, nargout);
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1080 }
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1081
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23503 diff changeset	1082 octave_value_list call (octave::tree_evaluator&, int nargout,
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23503 diff changeset	1083 const octave_value_list& args)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1084 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1085 // Emulate ()-type meta subsref
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1086
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23503 diff changeset	1087 std::list<octave_value_list> idx (1, args);
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1088 std::string type ("(");
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1089
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23503 diff changeset	1090 return subsref (type, idx, nargout);
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1091 }
15955 837a4a9b5049 Support constructor call with no indexing syntax. Michael Goffioul <michael.goffioul@gmail.com> parents: 15913 diff changeset	1092
23503 6a2fed2d39ac improve some function names John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	1093 bool accepts_postfix_index (char type) const
6a2fed2d39ac improve some function names John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	1094 { return object.meta_accepts_postfix_index (type); }
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1095
18441 b0aba84cf80f Support handle to classdef constructor. Michael Goffioul <michael.goffioul@gmail.com> parents: 18439 diff changeset	1096 bool
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20979 diff changeset	1097 is_classdef_constructor (const std::string& cname = "") const
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1098 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1099 bool retval = false;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1100
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1101 if (object.is_class ())
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1102 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1103 if (cname.empty ())
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1104 retval = true;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1105 else
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1106 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1107 cdef_class cls (object);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1108
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1109 if (cls.get_name () == cname)
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1110 retval = true;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1111 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1112 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1113
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1114 return retval;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1115 }
18441 b0aba84cf80f Support handle to classdef constructor. Michael Goffioul <michael.goffioul@gmail.com> parents: 18439 diff changeset	1116
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1117 private:
15986 14aa0b5a980c Abstract the meta-protocol layer to use it for other meta objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 15968 diff changeset	1118 cdef_meta_object object;
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1119 };
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1120
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1121 //----------------------------------------------------------------------------
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1122
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1123 class octave_classdef_superclass_ref : public octave_function
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1124 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1125 public:
25321 089852fc8929 use explict default and deleted ctors and dtors for classdef classes John W. Eaton <jwe@octave.org> parents: 25320 diff changeset	1126 octave_classdef_superclass_ref (void) = delete;
089852fc8929 use explict default and deleted ctors and dtors for classdef classes John W. Eaton <jwe@octave.org> parents: 25320 diff changeset	1127
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1128 octave_classdef_superclass_ref (const octave_value_list& a)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1129 : octave_function (), args (a) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1130
25321 089852fc8929 use explict default and deleted ctors and dtors for classdef classes John W. Eaton <jwe@octave.org> parents: 25320 diff changeset	1131 octave_classdef_superclass_ref (const octave_classdef_superclass_ref&) = delete;
089852fc8929 use explict default and deleted ctors and dtors for classdef classes John W. Eaton <jwe@octave.org> parents: 25320 diff changeset	1132
089852fc8929 use explict default and deleted ctors and dtors for classdef classes John W. Eaton <jwe@octave.org> parents: 25320 diff changeset	1133 octave_classdef_superclass_ref& operator = (const octave_classdef_superclass_ref&) = delete;
089852fc8929 use explict default and deleted ctors and dtors for classdef classes John W. Eaton <jwe@octave.org> parents: 25320 diff changeset	1134
22868 87e3163f6c87 use c++11 "= default" syntax for declaration of trivial destructors John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1135 ~octave_classdef_superclass_ref (void) = default;
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1136
24114 90932304969a maint: use correct const qualifier on overridden virtual function Mike Miller <mtmiller@octave.org> parents: 24100 diff changeset	1137 bool is_classdef_superclass_ref (void) const { return true; }
23865 d56c18dc1373 new predicates for classdef_superclass_ref objects John W. Eaton <jwe@octave.org> parents: 23843 diff changeset	1138
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23445 diff changeset	1139 octave_function * function_value (bool = false) { return this; }
18355 9ca314e79956 Allow to call superclass constructor without arguments. Michael Goffioul <michael.goffioul@gmail.com> parents: 18316 diff changeset	1140
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1141 octave_value_list
25360 bc5f225bc578 eliminate some global accesses to the breakpoint table John W. Eaton <jwe@octave.org> parents: 25342 diff changeset	1142 call (octave::tree_evaluator& tw, int nargout, const octave_value_list& idx)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1143 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1144 octave_value_list retval;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1145
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1146 std::string meth_name;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1147 bool in_constructor;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1148 cdef_class ctx;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1149
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1150 ctx = get_class_context (meth_name, in_constructor);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1151
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1152 if (! ctx.ok ())
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1153 error ("superclass calls can only occur in methods or constructors");
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1154
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1155 std::string mname = args(0).string_value ();
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1156 std::string cname = args(1).string_value ();
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1157
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1158 cdef_class cls = lookup_class (cname);
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1159
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1160 if (in_constructor)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1161 {
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1162 if (! is_direct_superclass (cls, ctx))
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1163 error ("`%s' is not a direct superclass of `%s'",
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1164 cname.c_str (), ctx.get_name ().c_str ());
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1165
25360 bc5f225bc578 eliminate some global accesses to the breakpoint table John W. Eaton <jwe@octave.org> parents: 25342 diff changeset	1166 if (! is_constructed_object (tw, mname))
21055 5e00ed38a58b maint: Replace if/error/else paradigm with just if/error. Rik <rik@octave.org> parents: 21040 diff changeset	1167 error ("cannot call superclass constructor with variable `%s'",
5e00ed38a58b maint: Replace if/error/else paradigm with just if/error. Rik <rik@octave.org> parents: 21040 diff changeset	1168 mname.c_str ());
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1169
25360 bc5f225bc578 eliminate some global accesses to the breakpoint table John W. Eaton <jwe@octave.org> parents: 25342 diff changeset	1170 octave::symbol_scope scope = tw.get_current_scope ();
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1171
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	1172 octave_value sym = scope.varval (mname);
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1173
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1174 cls.run_constructor (to_cdef_ref (sym), idx);
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1175
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1176 retval(0) = sym;
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1177 }
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1178 else
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1179 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1180 if (mname != meth_name)
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1181 error ("method name mismatch (`%s' != `%s')",
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1182 mname.c_str (), meth_name.c_str ());
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1183
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1184 if (! is_strict_superclass (cls, ctx))
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1185 error ("`%s' is not a superclass of `%s'",
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1186 cname.c_str (), ctx.get_name ().c_str ());
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1187
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1188 // I see 2 possible implementations here:
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1189 // 1) use cdef_object::subsref with a different class
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1190 // context; this avoids duplicating code, but
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1191 // assumes the object is always the first argument
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1192 // 2) lookup the method manually and call
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1193 // cdef_method::execute; this duplicates part of
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1194 // logic in cdef_object::subsref, but avoid the
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1195 // assumption of 1)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1196 // Not being sure about the assumption of 1), I
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1197 // go with option 2) for the time being.
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1198
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1199 cdef_method meth = cls.find_method (meth_name, false);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1200
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1201 if (! meth.ok ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1202 error ("no method `%s' found in superclass `%s'",
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1203 meth_name.c_str (), cname.c_str ());
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1204
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1205 retval = meth.execute (idx, nargout, true,
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1206 meth_name);
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1207 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1208
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1209 return retval;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1210 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1211
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1212 private:
25360 bc5f225bc578 eliminate some global accesses to the breakpoint table John W. Eaton <jwe@octave.org> parents: 25342 diff changeset	1213 bool is_constructed_object (octave::tree_evaluator& tw,
bc5f225bc578 eliminate some global accesses to the breakpoint table John W. Eaton <jwe@octave.org> parents: 25342 diff changeset	1214 const std::string& nm)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1215 {
25360 bc5f225bc578 eliminate some global accesses to the breakpoint table John W. Eaton <jwe@octave.org> parents: 25342 diff changeset	1216 octave::call_stack& cs = tw.get_call_stack ();
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23534 diff changeset	1217
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23534 diff changeset	1218 octave_function *of = cs.current ();
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1219
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1220 if (of->is_classdef_constructor ())
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1221 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1222 octave_user_function *uf = of->user_function_value (true);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1223
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1224 if (uf)
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1225 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1226 octave::tree_parameter_list *ret_list = uf->return_list ();
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1227
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1228 if (ret_list && ret_list->length () == 1)
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1229 return (ret_list->front ()->name () == nm);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1230 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1231 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1232
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1233 return false;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1234 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1235
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1236 private:
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1237 octave_value_list args;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1238 };
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1239
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1240 //----------------------------------------------------------------------------
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1241
25367 0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1242 void
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1243 cdef_object_rep::release (const cdef_object& obj)
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1244 {
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1245 // We need to be careful to keep a reference to the object if we are
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1246 // calling the delete method. The object is passed to the delete
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1247 // method as an argument and if the count is already zero when we
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1248 // do that, then we will increment the count while creating the
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1249 // argument list for the delete method and then it will be decremented
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1250 // back to zero and we'll find ourselves in an infinite loop.
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1251
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1252 if (refcount - 1 > static_count ())
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1253 {
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1254 --refcount;
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1255 return;
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1256 }
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1257
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1258 if (is_handle_object () && ! is_meta_object ())
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1259 {
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1260 octave::unwind_protect frame;
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1261
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1262 // Clear interrupts.
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1263 frame.protect_var (octave_interrupt_state);
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1264 octave_interrupt_state = 0;
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1265
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1266 // Disallow quit().
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1267 frame.protect_var (quit_allowed);
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1268 quit_allowed = false;
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1269
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1270 interpreter_try (frame);
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1271
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1272 try
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1273 {
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1274 // Call classdef "delete()" method on object
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1275 get_class ().delete_object (obj);
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1276 }
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1277 catch (const octave::interrupt_exception&)
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1278 {
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1279 octave::interpreter::recover_from_exception ();
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1280
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1281 warning ("interrupt occurred in handle class delete method");
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1282 }
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1283 catch (const octave::execution_exception&)
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1284 {
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1285 std::string msg = last_error_message ();
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1286 warning ("error caught while executing handle class delete method:\n%s\n",
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1287 msg.c_str ());
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1288
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1289 }
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1290 catch (const octave::exit_exception&)
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1291 {
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1292 // This shouldn't happen since we disabled quit above.
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1293 warning ("exit disabled while executing handle class delete method");
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1294 }
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1295 catch (...) // Yes, the black hole. We're in a d-tor.
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1296 {
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1297 // This shouldn't happen, in theory.
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1298 warning ("internal error: unhandled exception in handle class delete method");
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1299 }
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1300 }
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1301
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1302 // Now it is safe to set the count to zero.
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1303 refcount--;
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1304
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1305 destroy ();
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1306 }
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1307
19184 e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1308 octave_map
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1309 cdef_object::map_value (void) const
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1310 {
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1311 octave_map retval;
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1312
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1313 warning_with_id ("Octave:classdef-to-struct",
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1314 "struct: converting a classdef object into a struct "
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1315 "overrides the access restrictions defined for properties. "
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1316 "All properties are returned, including private and "
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1317 "protected ones.");
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1318
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1319 cdef_class cls = get_class ();
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1320
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1321 if (cls.ok ())
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1322 {
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1323 std::map<std::string, cdef_property> props;
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1324
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1325 props = cls.get_property_map (cdef_class::property_all);
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1326
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	1327 // FIXME: Why not const here?
50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	1328 for (auto& prop_val : props)
19184 e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1329 {
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1330 if (is_array ())
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1331 {
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1332 Array<cdef_object> a_obj = array_value ();
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1333
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1334 Cell cvalue (a_obj.dims ());
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1335
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1336 for (octave_idx_type i = 0; i < a_obj.numel (); i++)
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	1337 cvalue (i) = prop_val.second.get_value (a_obj(i), false);
50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	1338
50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	1339 retval.setfield (prop_val.first, cvalue);
19184 e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1340 }
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1341 else
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1342 {
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1343 Cell cvalue (dim_vector (1, 1),
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	1344 prop_val.second.get_value (*this, false));
50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	1345
50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	1346 retval.setfield (prop_val.first, cvalue);
19184 e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1347 }
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1348 }
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1349 }
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1350
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1351 return retval;
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1352 }
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1353
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1354 string_vector
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1355 cdef_object_rep::map_keys (void) const
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1356 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1357 cdef_class cls = get_class ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1358
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1359 if (cls.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1360 return cls.get_names ();
19597 db92e7e28e1f strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19343 diff changeset	1361
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1362 return string_vector ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1363 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1364
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1365 octave_value_list
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1366 cdef_object_scalar::subsref (const std::string& type,
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1367 const std::list<octave_value_list>& idx,
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1368 int nargout, size_t& skip,
16696 665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	1369 const cdef_class& context, bool auto_add)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1370 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1371 skip = 0;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1372
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1373 cdef_class cls = (context.ok () ? context : get_class ());
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1374
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1375 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1376
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1377 if (! cls.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1378 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1379
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1380 switch (type[0])
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1381 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1382 case '.':
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1383 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1384 std::string name = (idx.front ())(0).string_value ();
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1385
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1386 cdef_method meth = cls.find_method (name);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1387
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1388 if (meth.ok ())
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1389 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1390 int _nargout = (type.length () > 2 ? 1 : nargout);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1391
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1392 octave_value_list args;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1393
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1394 skip = 1;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1395
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1396 if (type.length () > 1 && type[1] == '(')
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1397 {
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25321 diff changeset	1398 auto it = idx.begin ();
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1399
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1400 args = *++it;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1401
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1402 skip++;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1403 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1404
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1405 if (meth.is_static ())
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1406 retval = meth.execute (args, _nargout, true, "subsref");
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1407 else
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1408 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1409 refcount++;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1410 retval = meth.execute (cdef_object (this), args, _nargout,
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1411 true, "subsref");
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1412 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1413 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1414
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1415 if (skip == 0)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1416 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1417 cdef_property prop = cls.find_property (name);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1418
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1419 if (! prop.ok ())
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1420 error ("subsref: unknown method or property: %s", name.c_str ());
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1421
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1422 if (prop.is_constant ())
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1423 retval(0) = prop.get_value (true, "subsref");
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1424 else
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1425 {
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1426 refcount++;
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1427 retval(0) = prop.get_value (cdef_object (this),
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1428 true, "subsref");
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1429 }
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1430
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1431 skip = 1;
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1432 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1433 break;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1434 }
16696 665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	1435
665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	1436 case '(':
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1437 {
20189 b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1438 const octave_value_list& ival = idx.front ();
b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1439
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1440 refcount++;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1441 cdef_object this_obj (this);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1442
20189 b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1443 if (ival.empty ())
b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1444 {
b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1445 skip++;
b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1446 retval(0) = to_ov (this_obj);
b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1447 }
b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1448 else
b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1449 {
b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1450 Array<cdef_object> arr (dim_vector (1, 1), this_obj);
b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1451
b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1452 cdef_object new_obj = cdef_object (new cdef_object_array (arr));
b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1453
b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1454 new_obj.set_class (get_class ());
b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1455
b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1456 retval = new_obj.subsref (type, idx, nargout, skip, cls, auto_add);
b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1457 }
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1458 }
16696 665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	1459 break;
665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	1460
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1461 default:
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1462 error ("object cannot be indexed with `%c'", type[0]);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1463 break;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1464 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1465
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1466 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1467 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1468
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1469 octave_value
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1470 cdef_object_scalar::subsasgn (const std::string& type,
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1471 const std::list<octave_value_list>& idx,
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1472 const octave_value& rhs)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1473 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1474 octave_value retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1475
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1476 cdef_class cls = get_class ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1477
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1478 switch (type[0])
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1479 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1480 case '.':
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1481 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1482 std::string name = (idx.front ())(0).string_value ();
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1483
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1484 cdef_property prop = cls.find_property (name);
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1485
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1486 if (! prop.ok ())
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1487 error ("subsasgn: unknown property: %s", name.c_str ());
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1488
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1489 if (prop.is_constant ())
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1490 error ("subsasgn: cannot assign constant property: %s",
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1491 name.c_str ());
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1492
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1493 refcount++;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1494
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1495 cdef_object obj (this);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1496
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1497 if (type.length () == 1)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1498 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1499 prop.set_value (obj, rhs, true, "subsasgn");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1500
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1501 retval = to_ov (obj);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1502 }
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1503 else
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1504 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1505 octave_value val =
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1506 prop.get_value (obj, true, "subsasgn");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1507
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1508 std::list<octave_value_list> args (idx);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1509
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1510 args.erase (args.begin ());
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1511
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1512 val = val.assign (octave_value::op_asn_eq,
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1513 type.substr (1), args, rhs);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1514
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1515 if (val.class_name () != "object"
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1516 \|\| ! to_cdef (val).is_handle_object ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1517 prop.set_value (obj, val, true, "subsasgn");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1518
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1519 retval = to_ov (obj);
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1520 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1521 }
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1522 break;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1523
16694 50b37deadb66 Promote scalar object to array for '(' idnex assignment. Michael Goffioul <michael.goffioul@gmail.com> parents: 16692 diff changeset	1524 case '(':
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1525 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1526 refcount++;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1527
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1528 cdef_object this_obj (this);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1529
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1530 Array<cdef_object> arr (dim_vector (1, 1), this_obj);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1531
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1532 cdef_object new_obj = cdef_object (new cdef_object_array (arr));
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1533
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1534 new_obj.set_class (get_class ());
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1535
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1536 octave_value tmp = new_obj.subsasgn (type, idx, rhs);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1537
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1538 retval = tmp;
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1539 }
16694 50b37deadb66 Promote scalar object to array for '(' idnex assignment. Michael Goffioul <michael.goffioul@gmail.com> parents: 16692 diff changeset	1540 break;
50b37deadb66 Promote scalar object to array for '(' idnex assignment. Michael Goffioul <michael.goffioul@gmail.com> parents: 16692 diff changeset	1541
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1542 default:
16694 50b37deadb66 Promote scalar object to array for '(' idnex assignment. Michael Goffioul <michael.goffioul@gmail.com> parents: 16692 diff changeset	1543 error ("subsasgn: object cannot be index with `%c'", type[0]);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1544 break;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1545 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1546
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1547 return retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1548 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1549
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1550 void
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1551 cdef_object_scalar::mark_for_construction (const cdef_class& cls)
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1552 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1553 std::string cls_name = cls.get_name ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1554
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1555 Cell supcls = cls.get ("SuperClasses").cell_value ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1556
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1557 std::list<cdef_class> supcls_list = lookup_classes (supcls);
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1558
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1559 ctor_list[cls] = supcls_list;
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1560 }
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1561
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1562 octave_value_list
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1563 cdef_object_array::subsref (const std::string& type,
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1564 const std::list<octave_value_list>& idx,
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1565 int /* nargout */, size_t& skip,
16696 665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	1566 const cdef_class& /* context */, bool auto_add)
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1567 {
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1568 octave_value_list retval;
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1569
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1570 skip = 1;
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1571
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1572 switch (type[0])
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1573 {
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1574 case '(':
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1575 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1576 const octave_value_list& ival = idx.front ();
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1577
20125 274b52724931 Stop segfault when using empty indexing of a classdef object. Rik <rik@octave.org> parents: 20052 diff changeset	1578 if (ival.empty ())
274b52724931 Stop segfault when using empty indexing of a classdef object. Rik <rik@octave.org> parents: 20052 diff changeset	1579 {
20189 b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1580 refcount++;
b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1581 retval(0) = to_ov (cdef_object (this));
20125 274b52724931 Stop segfault when using empty indexing of a classdef object. Rik <rik@octave.org> parents: 20052 diff changeset	1582 break;
274b52724931 Stop segfault when using empty indexing of a classdef object. Rik <rik@octave.org> parents: 20052 diff changeset	1583 }
274b52724931 Stop segfault when using empty indexing of a classdef object. Rik <rik@octave.org> parents: 20052 diff changeset	1584
20189 b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1585 bool is_scalar = true;
b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1586 Array<idx_vector> iv (dim_vector (1, ival.length ()));
b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1587
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1588 for (int i = 0; i < ival.length (); i++)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1589 {
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20488 diff changeset	1590 try
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20488 diff changeset	1591 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20488 diff changeset	1592 iv(i) = ival(i).index_vector ();
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20488 diff changeset	1593 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22324 diff changeset	1594 catch (octave::index_exception& e)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1595 {
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20488 diff changeset	1596 // Rethrow to allow more info to be reported later.
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20488 diff changeset	1597 e.set_pos_if_unset (ival.length (), i+1);
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20488 diff changeset	1598 throw;
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1599 }
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1600
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1601 is_scalar = is_scalar && iv(i).is_scalar ();
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1602 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1603
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1604 Array<cdef_object> ires = array.index (iv, auto_add);
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1605
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1606 // If resizing is enabled (auto_add = true), it's possible
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1607 // indexing was out-of-bound and the result array contains
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1608 // invalid cdef_objects.
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1609
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1610 if (auto_add)
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1611 fill_empty_values (ires);
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1612
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1613 if (is_scalar)
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1614 retval(0) = to_ov (ires(0));
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1615 else
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1616 {
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1617 cdef_object array_obj (new cdef_object_array (ires));
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1618
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1619 array_obj.set_class (get_class ());
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1620
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1621 retval(0) = to_ov (array_obj);
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1622 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1623 }
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1624 break;
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1625
16692 b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1626 case '.':
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1627 if (type.size () == 1 && idx.size () == 1)
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1628 {
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1629 Cell c (dims ());
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1630
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1631 octave_idx_type n = array.numel ();
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1632
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1633 // dummy variables
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1634 size_t dummy_skip;
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1635 cdef_class dummy_cls;
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1636
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1637 for (octave_idx_type i = 0; i < n; i++)
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1638 {
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1639 octave_value_list r = array(i).subsref (type, idx, 1, dummy_skip,
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1640 dummy_cls);
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1641
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1642 if (r.length () > 0)
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1643 c(i) = r(0);
16692 b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1644 }
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1645
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1646 retval(0) = octave_value (c, true);
16692 b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1647
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1648 break;
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1649 }
23826 d69021d58a61 avoid fallthrough warnings John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	1650 OCTAVE_FALLTHROUGH;
16692 b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1651
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1652 default:
20428 7ac907da9fba Use error() rather than ::error() unless explicitly required. Rik <rik@octave.org> parents: 20193 diff changeset	1653 error ("can't perform indexing operation on array of %s objects",
7ac907da9fba Use error() rather than ::error() unless explicitly required. Rik <rik@octave.org> parents: 20193 diff changeset	1654 class_name ().c_str ());
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1655 break;
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1656 }
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1657
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1658 return retval;
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1659 }
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1660
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1661 octave_value
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1662 cdef_object_array::subsasgn (const std::string& type,
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1663 const std::list<octave_value_list>& idx,
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1664 const octave_value& rhs)
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1665 {
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1666 octave_value retval;
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1667
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1668 switch (type[0])
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1669 {
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1670 case '(':
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1671 if (type.length () == 1)
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1672 {
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1673 cdef_object rhs_obj = to_cdef (rhs);
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1674
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1675 if (rhs_obj.get_class () != get_class ())
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1676 error ("can't assign %s object into array of %s objects.",
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1677 rhs_obj.class_name ().c_str (),
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1678 class_name ().c_str ());
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1679
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1680 const octave_value_list& ival = idx.front ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1681 bool is_scalar = true;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1682 Array<idx_vector> iv (dim_vector (1, ival.length ()));
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1683
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1684 for (int i = 0; i < ival.length (); i++)
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1685 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1686 try
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1687 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1688 iv(i) = ival(i).index_vector ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1689 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22324 diff changeset	1690 catch (octave::index_exception& e)
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1691 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1692 e.set_pos_if_unset (ival.length (), i+1);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1693 throw; // var name set in pt-idx.cc / pt-assign.cc
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1694 }
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1695
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1696 is_scalar = is_scalar && iv(i).is_scalar ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1697 }
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1698
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1699 Array<cdef_object> rhs_mat;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1700
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1701 if (! rhs_obj.is_array ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1702 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1703 rhs_mat = Array<cdef_object> (dim_vector (1, 1));
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1704 rhs_mat(0) = rhs_obj;
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1705 }
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1706 else
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1707 rhs_mat = rhs_obj.array_value ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1708
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1709 octave_idx_type n = array.numel ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1710
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1711 array.assign (iv, rhs_mat, cdef_object ());
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1712
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1713 if (array.numel () > n)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1714 fill_empty_values ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1715
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1716 refcount++;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1717 retval = to_ov (cdef_object (this));
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1718 }
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1719 else
16695 2823f8e3da77 Add multi-level index assignment for object array. Michael Goffioul <michael.goffioul@gmail.com> parents: 16694 diff changeset	1720 {
23345 0b6810085ed3 Altering class member of object array modifies other class members (bug #46660). Lachlan Andrew <lachlanbis@gmail.com> parents: 23220 diff changeset	1721 const octave_value_list& ivl = idx.front ();
0b6810085ed3 Altering class member of object array modifies other class members (bug #46660). Lachlan Andrew <lachlanbis@gmail.com> parents: 23220 diff changeset	1722
0b6810085ed3 Altering class member of object array modifies other class members (bug #46660). Lachlan Andrew <lachlanbis@gmail.com> parents: 23220 diff changeset	1723 // Fill in trailing singleton dimensions so that
0b6810085ed3 Altering class member of object array modifies other class members (bug #46660). Lachlan Andrew <lachlanbis@gmail.com> parents: 23220 diff changeset	1724 // array.index doesn't create a new blank entry (bug #46660).
0b6810085ed3 Altering class member of object array modifies other class members (bug #46660). Lachlan Andrew <lachlanbis@gmail.com> parents: 23220 diff changeset	1725 const octave_idx_type one = static_cast<octave_idx_type> (1);
0b6810085ed3 Altering class member of object array modifies other class members (bug #46660). Lachlan Andrew <lachlanbis@gmail.com> parents: 23220 diff changeset	1726 const octave_value_list& ival = ivl.length () >= 2
0b6810085ed3 Altering class member of object array modifies other class members (bug #46660). Lachlan Andrew <lachlanbis@gmail.com> parents: 23220 diff changeset	1727 ? ivl : ((array.dims ()(0) == 1)
0b6810085ed3 Altering class member of object array modifies other class members (bug #46660). Lachlan Andrew <lachlanbis@gmail.com> parents: 23220 diff changeset	1728 ? ovl (one, ivl(0))
0b6810085ed3 Altering class member of object array modifies other class members (bug #46660). Lachlan Andrew <lachlanbis@gmail.com> parents: 23220 diff changeset	1729 : ovl (ivl(0), one));
16695 2823f8e3da77 Add multi-level index assignment for object array. Michael Goffioul <michael.goffioul@gmail.com> parents: 16694 diff changeset	1730
2823f8e3da77 Add multi-level index assignment for object array. Michael Goffioul <michael.goffioul@gmail.com> parents: 16694 diff changeset	1731 bool is_scalar = true;
2823f8e3da77 Add multi-level index assignment for object array. Michael Goffioul <michael.goffioul@gmail.com> parents: 16694 diff changeset	1732
23345 0b6810085ed3 Altering class member of object array modifies other class members (bug #46660). Lachlan Andrew <lachlanbis@gmail.com> parents: 23220 diff changeset	1733 Array<idx_vector> iv (dim_vector (1, ival.length ()));
16695 2823f8e3da77 Add multi-level index assignment for object array. Michael Goffioul <michael.goffioul@gmail.com> parents: 16694 diff changeset	1734
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1735 for (int i = 0; i < ival.length (); i++)
16695 2823f8e3da77 Add multi-level index assignment for object array. Michael Goffioul <michael.goffioul@gmail.com> parents: 16694 diff changeset	1736 {
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20488 diff changeset	1737 try
16695 2823f8e3da77 Add multi-level index assignment for object array. Michael Goffioul <michael.goffioul@gmail.com> parents: 16694 diff changeset	1738 {
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20488 diff changeset	1739 iv(i) = ival(i).index_vector ();
16695 2823f8e3da77 Add multi-level index assignment for object array. Michael Goffioul <michael.goffioul@gmail.com> parents: 16694 diff changeset	1740 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22324 diff changeset	1741 catch (octave::index_exception& e)
16695 2823f8e3da77 Add multi-level index assignment for object array. Michael Goffioul <michael.goffioul@gmail.com> parents: 16694 diff changeset	1742 {
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20488 diff changeset	1743 // Rethrow to allow more info to be reported later.
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20488 diff changeset	1744 e.set_pos_if_unset (ival.length (), i+1);
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20488 diff changeset	1745 throw;
16695 2823f8e3da77 Add multi-level index assignment for object array. Michael Goffioul <michael.goffioul@gmail.com> parents: 16694 diff changeset	1746 }
2823f8e3da77 Add multi-level index assignment for object array. Michael Goffioul <michael.goffioul@gmail.com> parents: 16694 diff changeset	1747
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1748 is_scalar = is_scalar && iv(i).is_scalar ();
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1749
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1750 if (! is_scalar)
21055 5e00ed38a58b maint: Replace if/error/else paradigm with just if/error. Rik <rik@octave.org> parents: 21040 diff changeset	1751 error ("subsasgn: invalid indexing for object array assignment"
5e00ed38a58b maint: Replace if/error/else paradigm with just if/error. Rik <rik@octave.org> parents: 21040 diff changeset	1752 ", the index must reference a single object in the "
5e00ed38a58b maint: Replace if/error/else paradigm with just if/error. Rik <rik@octave.org> parents: 21040 diff changeset	1753 "array.");
16695 2823f8e3da77 Add multi-level index assignment for object array. Michael Goffioul <michael.goffioul@gmail.com> parents: 16694 diff changeset	1754 }
2823f8e3da77 Add multi-level index assignment for object array. Michael Goffioul <michael.goffioul@gmail.com> parents: 16694 diff changeset	1755
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1756 Array<cdef_object> a = array.index (iv, true);
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1757
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1758 if (a.numel () != 1)
21055 5e00ed38a58b maint: Replace if/error/else paradigm with just if/error. Rik <rik@octave.org> parents: 21040 diff changeset	1759 error ("subsasgn: invalid indexing for object array assignment");
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1760
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1761 cdef_object obj = a(0);
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1762
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1763 int ignore_copies = 0;
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1764
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1765 // If the object in 'a' is not valid, this means the index
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1766 // was out-of-bound and we need to create a new object.
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1767
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1768 if (! obj.ok ())
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1769 obj = get_class ().construct_object (octave_value_list ());
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1770 else
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21724 diff changeset	1771 // Optimize the subsasgn call to come. There are 2 copies
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1772 // that we can safely ignore:
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1773 // - 1 in "array"
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1774 // - 1 in "a"
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1775 ignore_copies = 2;
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1776
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1777 std::list<octave_value_list> next_idx (idx);
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1778
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1779 next_idx.erase (next_idx.begin ());
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1780
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1781 octave_value tmp = obj.subsasgn (type.substr (1), next_idx,
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1782 rhs, ignore_copies);
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1783
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1784 cdef_object robj = to_cdef (tmp);
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1785
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1786 if (! robj.ok ()
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1787 \|\| robj.is_array ()
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1788 \|\| robj.get_class () != get_class ())
21055 5e00ed38a58b maint: Replace if/error/else paradigm with just if/error. Rik <rik@octave.org> parents: 21040 diff changeset	1789 error ("subasgn: invalid assignment into array of %s objects",
5e00ed38a58b maint: Replace if/error/else paradigm with just if/error. Rik <rik@octave.org> parents: 21040 diff changeset	1790 class_name ().c_str ());
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1791
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1792 // Small optimization, when dealing with handle
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1793 // objects, we don't need to re-assign the result
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1794 // of subsasgn back into the array.
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1795
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1796 if (! robj.is (a(0)))
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1797 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1798 Array<cdef_object> rhs_a (dim_vector (1, 1),
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1799 robj);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1800
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1801 octave_idx_type n = array.numel ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1802
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1803 array.assign (iv, rhs_a);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1804
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1805 if (array.numel () > n)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1806 fill_empty_values ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1807 }
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1808
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1809 refcount++;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1810
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1811 retval = to_ov (cdef_object (this));
16695 2823f8e3da77 Add multi-level index assignment for object array. Michael Goffioul <michael.goffioul@gmail.com> parents: 16694 diff changeset	1812 }
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1813 break;
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1814
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1815 default:
20428 7ac907da9fba Use error() rather than ::error() unless explicitly required. Rik <rik@octave.org> parents: 20193 diff changeset	1816 error ("can't perform indexing operation on array of %s objects",
7ac907da9fba Use error() rather than ::error() unless explicitly required. Rik <rik@octave.org> parents: 20193 diff changeset	1817 class_name ().c_str ());
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1818 break;
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1819 }
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1820
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1821 return retval;
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1822 }
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1823
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1824 void
16696 665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	1825 cdef_object_array::fill_empty_values (Array<cdef_object>& arr)
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1826 {
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1827 cdef_class cls = get_class ();
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1828
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1829 cdef_object obj;
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1830
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1831 int n = arr.numel ();
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1832
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1833 for (int i = 0; i < n; i++)
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1834 {
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1835 if (! arr.xelem (i).ok ())
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1836 {
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1837 if (! obj.ok ())
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1838 {
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1839 obj = cls.construct_object (octave_value_list ());
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1840
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1841 arr.xelem (i) = obj;
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1842 }
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1843 else
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1844 arr.xelem (i) = obj.copy ();
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1845 }
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1846 }
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1847 }
19597 db92e7e28e1f strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19343 diff changeset	1848
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1849 bool
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1850 cdef_object_scalar::is_constructed_for (const cdef_class& cls) const
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1851 {
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1852 return (is_constructed ()
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1853 \|\| ctor_list.find (cls) == ctor_list.end ());
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1854 }
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1855
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1856 bool
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1857 cdef_object_scalar::is_partially_constructed_for (const cdef_class& cls) const
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1858 {
23534 b6498c088fca maint: Don't write '> >' for declaration of templates that use templates. Rik <rik@octave.org> parents: 23533 diff changeset	1859 std::map< cdef_class, std::list<cdef_class>>::const_iterator it;
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1860
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1861 if (is_constructed ())
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1862 return true;
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1863 else if ((it = ctor_list.find (cls)) == ctor_list.end ()
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1864 \|\| it->second.empty ())
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1865 return true;
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1866
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	1867 for (const auto& cdef_cls : it->second)
50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	1868 if (! is_constructed_for (cdef_cls))
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1869 return false;
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1870
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1871 return true;
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1872 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1873
20921 4d3daf7e43f3 eliminate trailing whitespace in source files John W. Eaton <jwe@octave.org> parents: 20912 diff changeset	1874 inline void
20841 9851a296cf87 Fix compilation of classdef with the clang compiler (bug #41178) akira noda <you.akira.noda@gmail.com> parents: 20181 diff changeset	1875 cdef_object_scalar::mark_as_constructed (const cdef_class& cls)
9851a296cf87 Fix compilation of classdef with the clang compiler (bug #41178) akira noda <you.akira.noda@gmail.com> parents: 20181 diff changeset	1876 {
9851a296cf87 Fix compilation of classdef with the clang compiler (bug #41178) akira noda <you.akira.noda@gmail.com> parents: 20181 diff changeset	1877 ctor_list.erase (cls);
9851a296cf87 Fix compilation of classdef with the clang compiler (bug #41178) akira noda <you.akira.noda@gmail.com> parents: 20181 diff changeset	1878 }
9851a296cf87 Fix compilation of classdef with the clang compiler (bug #41178) akira noda <you.akira.noda@gmail.com> parents: 20181 diff changeset	1879
15870 2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1880 handle_cdef_object::~handle_cdef_object (void)
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1881 {
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	1882 #if DEBUG_TRACE
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	1883 std::cerr << "deleting " << get_class ().get_name ()
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	1884 << " object (handle)" << std::endl;
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	1885 #endif
15870 2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1886 }
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1887
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1888 value_cdef_object::~value_cdef_object (void)
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1889 {
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	1890 #if DEBUG_TRACE
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	1891 std::cerr << "deleting " << get_class ().get_name ()
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	1892 << " object (value)" << std::endl;
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	1893 #endif
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1894 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1895
23533 8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	1896 cdef_class::cdef_class_rep::cdef_class_rep (const std::list<cdef_class>& superclasses)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1897 : cdef_meta_object_rep (), member_count (0), handle_class (false),
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1898 object_count (0), meta (false)
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1899 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1900 put ("SuperClasses", to_ov (superclasses));
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1901 implicit_ctor_list = superclasses;
15870 2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1902 }
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1903
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1904 cdef_method
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1905 cdef_class::cdef_class_rep::find_method (const std::string& nm, bool local)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1906 {
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25321 diff changeset	1907 auto it = method_map.find (nm);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1908
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1909 if (it == method_map.end ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1910 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1911 // FIXME: look into class directory
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1912 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1913 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1914 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1915 cdef_method& meth = it->second;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1916
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1917 // FIXME: check if method reload needed
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1918
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1919 if (meth.ok ())
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	1920 return meth;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1921 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1922
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1923 if (! local)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1924 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1925 // Look into superclasses
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1926
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1927 Cell super_classes = get ("SuperClasses").cell_value ();
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1928
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1929 for (int i = 0; i < super_classes.numel (); i++)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1930 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1931 cdef_class cls = lookup_class (super_classes(i));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1932
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1933 cdef_method meth = cls.find_method (nm);
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1934
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1935 if (meth.ok ())
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1936 return meth;
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1937 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1938 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1939
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1940 return cdef_method ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1941 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1942
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1943 class ctor_analyzer : public octave::tree_walker
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1944 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1945 public:
25321 089852fc8929 use explict default and deleted ctors and dtors for classdef classes John W. Eaton <jwe@octave.org> parents: 25320 diff changeset	1946 ctor_analyzer (void) = delete;
089852fc8929 use explict default and deleted ctors and dtors for classdef classes John W. Eaton <jwe@octave.org> parents: 25320 diff changeset	1947
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1948 ctor_analyzer (const std::string& ctor, const std::string& obj)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1949 : octave::tree_walker (), who (ctor), obj_name (obj) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1950
25321 089852fc8929 use explict default and deleted ctors and dtors for classdef classes John W. Eaton <jwe@octave.org> parents: 25320 diff changeset	1951 ctor_analyzer (const ctor_analyzer&) = delete;
089852fc8929 use explict default and deleted ctors and dtors for classdef classes John W. Eaton <jwe@octave.org> parents: 25320 diff changeset	1952
089852fc8929 use explict default and deleted ctors and dtors for classdef classes John W. Eaton <jwe@octave.org> parents: 25320 diff changeset	1953 ctor_analyzer& operator = (const ctor_analyzer&) = delete;
089852fc8929 use explict default and deleted ctors and dtors for classdef classes John W. Eaton <jwe@octave.org> parents: 25320 diff changeset	1954
089852fc8929 use explict default and deleted ctors and dtors for classdef classes John W. Eaton <jwe@octave.org> parents: 25320 diff changeset	1955 ~ctor_analyzer (void) = default;
089852fc8929 use explict default and deleted ctors and dtors for classdef classes John W. Eaton <jwe@octave.org> parents: 25320 diff changeset	1956
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1957 void visit_statement_list (octave::tree_statement_list& t)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1958 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	1959 for (const auto& stmt_p : t)
50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	1960 stmt_p->accept (*this);
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1961 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1962
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1963 void visit_statement (octave::tree_statement& t)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1964 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1965 if (t.is_expression ())
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1966 t.expression ()->accept (*this);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1967 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1968
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1969 void visit_simple_assignment (octave::tree_simple_assignment& t)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1970 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1971 t.right_hand_side ()->accept (*this);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1972 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1973
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1974 void visit_multi_assignment (octave::tree_multi_assignment& t)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1975 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1976 t.right_hand_side ()->accept (*this);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1977 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1978
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1979 void visit_index_expression (octave::tree_index_expression& t)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1980 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1981 t.expression ()->accept (*this);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1982 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1983
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1984 void visit_funcall (octave::tree_funcall& t)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1985 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1986 octave_value fcn = t.function ();
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1987
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1988 if (fcn.is_function ())
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1989 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1990 octave_function *of = fcn.function_value (true);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1991
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1992 if (of)
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1993 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1994 if (of->name () == "__superclass_reference__")
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1995 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1996 octave_value_list args = t.arguments ();
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1997
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1998 if (args(0).string_value () == obj_name)
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1999 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2000 std::string class_name = args(1).string_value ();
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2001
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2002 cdef_class cls = lookup_class (class_name, false);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2003
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2004 if (cls.ok ())
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2005 ctor_list.push_back (cls);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2006 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2007 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2008 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2009 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2010 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2011
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2012 std::list<cdef_class> get_constructor_list (void) const
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2013 { return ctor_list; }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2014
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2015 // NO-OP
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2016 void visit_anon_fcn_handle (octave::tree_anon_fcn_handle&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2017 void visit_argument_list (octave::tree_argument_list&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2018 void visit_binary_expression (octave::tree_binary_expression&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2019 void visit_break_command (octave::tree_break_command&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2020 void visit_colon_expression (octave::tree_colon_expression&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2021 void visit_continue_command (octave::tree_continue_command&) { }
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	2022 void visit_decl_command (octave::tree_decl_command&) { }
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	2023 void visit_decl_init_list (octave::tree_decl_init_list&) { }
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2024 void visit_decl_elt (octave::tree_decl_elt&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2025 void visit_simple_for_command (octave::tree_simple_for_command&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2026 void visit_complex_for_command (octave::tree_complex_for_command&) { }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2027 void visit_octave_user_script (octave_user_script&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2028 void visit_octave_user_function (octave_user_function&) { }
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2029 void visit_function_def (octave::tree_function_def&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2030 void visit_identifier (octave::tree_identifier&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2031 void visit_if_clause (octave::tree_if_clause&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2032 void visit_if_command (octave::tree_if_command&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2033 void visit_if_command_list (octave::tree_if_command_list&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2034 void visit_switch_case (octave::tree_switch_case&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2035 void visit_switch_case_list (octave::tree_switch_case_list&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2036 void visit_switch_command (octave::tree_switch_command&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2037 void visit_matrix (octave::tree_matrix&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2038 void visit_cell (octave::tree_cell&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2039 void visit_no_op_command (octave::tree_no_op_command&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2040 void visit_constant (octave::tree_constant&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2041 void visit_fcn_handle (octave::tree_fcn_handle&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2042 void visit_parameter_list (octave::tree_parameter_list&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2043 void visit_postfix_expression (octave::tree_postfix_expression&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2044 void visit_prefix_expression (octave::tree_prefix_expression&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2045 void visit_return_command (octave::tree_return_command&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2046 void visit_return_list (octave::tree_return_list&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2047 void visit_try_catch_command (octave::tree_try_catch_command&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2048 void visit_unwind_protect_command (octave::tree_unwind_protect_command&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2049 void visit_while_command (octave::tree_while_command&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2050 void visit_do_until_command (octave::tree_do_until_command&) { }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2051
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2052 private:
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	2053 // The name of the constructor being analyzed.
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2054 std::string who;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2055
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	2056 // The name of the first output argument of the constructor.
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2057 std::string obj_name;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2058
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	2059 // The list of superclass constructors that are explicitly called.
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2060 std::list<cdef_class> ctor_list;
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2061 };
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2062
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2063 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2064 cdef_class::cdef_class_rep::install_method (const cdef_method& meth)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2065 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2066 method_map[meth.get_name ()] = meth;
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2067
15911 b18b7e560236 More flexible refcount to account for owned back-references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15910 diff changeset	2068 member_count++;
b18b7e560236 More flexible refcount to account for owned back-references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15910 diff changeset	2069
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2070 if (meth.is_constructor ())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2071 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2072 // Analyze the constructor code to determine what superclass
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2073 // constructors are called explicitly.
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2074
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2075 octave_function *of = meth.get_function ().function_value (true);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2076
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2077 if (of)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2078 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2079 octave_user_function *uf = of->user_function_value (true);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2080
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2081 if (uf)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2082 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2083 octave::tree_parameter_list *ret_list = uf->return_list ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2084 octave::tree_statement_list *body = uf->body ();
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2085
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2086 if (! ret_list \|\| ret_list->size () != 1)
20428 7ac907da9fba Use error() rather than ::error() unless explicitly required. Rik <rik@octave.org> parents: 20193 diff changeset	2087 error ("%s: invalid constructor output arguments",
7ac907da9fba Use error() rather than ::error() unless explicitly required. Rik <rik@octave.org> parents: 20193 diff changeset	2088 meth.get_name ().c_str ());
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2089
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2090 std::string obj_name = ret_list->front ()->name ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2091 ctor_analyzer a (meth.get_name (), obj_name);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2092
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2093 body->accept (a);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2094
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2095 std::list<cdef_class> explicit_ctor_list
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2096 = a.get_constructor_list ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2097
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2098 for (const auto& cdef_cls : explicit_ctor_list)
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2099 {
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2100 #if DEBUG_TRACE
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2101 std::cerr << "explicit superclass constructor: "
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2102 << cdef_cls.get_name () << std::endl;
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2103 #endif
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2104
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2105 implicit_ctor_list.remove (cdef_cls);
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2106 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2107 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2108 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2109 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2110 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2111
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2112 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2113 cdef_class::cdef_class_rep::load_all_methods (void)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2114 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2115 // FIXME: re-scan class directory
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2116 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2117
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2118 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2119 cdef_class::cdef_class_rep::get_methods (void)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2120 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2121 std::map<std::string,cdef_method> meths;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2122
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2123 find_methods (meths, false);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2124
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2125 Cell c (meths.size (), 1);
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2126
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2127 int idx = 0;
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2128
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2129 for (const auto& nm_mthd : meths)
50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2130 c(idx++, 0) = to_ov (nm_mthd.second);
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2131
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2132 return c;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2133 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2134
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2135 void
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2136 cdef_class::cdef_class_rep::find_methods (std::map<std::string,
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2137 cdef_method>& meths,
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2138 bool only_inherited)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2139 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2140 load_all_methods ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2141
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2142 method_const_iterator it;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2143
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2144 for (it = method_map.begin (); it != method_map.end (); ++it)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2145 {
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2146 if (! it->second.is_constructor ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2147 {
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2148 std::string nm = it->second.get_name ();
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2149
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2150 if (meths.find (nm) == meths.end ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2151 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2152 if (only_inherited)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2153 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2154 octave_value acc = it->second.get ("Access");
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2155
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2156 if (! acc.is_string ()
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2157 \|\| acc.string_value () == "private")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2158 continue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2159 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2160
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2161 meths[nm] = it->second;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2162 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2163 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2164 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2165
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2166 // Look into superclasses
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2167
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2168 Cell super_classes = get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2169
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2170 for (int i = 0; i < super_classes.numel (); i++)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2171 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2172 cdef_class cls = lookup_class (super_classes(i));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2173
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2174 cls.get_rep ()->find_methods (meths, true);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2175 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2176 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2177
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2178 cdef_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2179 cdef_class::cdef_class_rep::find_property (const std::string& nm)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2180 {
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25321 diff changeset	2181 auto it = property_map.find (nm);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2182
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2183 if (it != property_map.end ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2184 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2185 cdef_property& prop = it->second;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2186
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2187 if (prop.ok ())
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	2188 return prop;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2189 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2190
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2191 // Look into superclasses
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2192
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2193 Cell super_classes = get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2194
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2195 for (int i = 0; i < super_classes.numel (); i++)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2196 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2197 cdef_class cls = lookup_class (super_classes(i));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2198
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2199 cdef_property prop = cls.find_property (nm);
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2200
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2201 if (prop.ok ())
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2202 return prop;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2203 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2204
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2205 return cdef_property ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2206 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2207
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2208 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2209 cdef_class::cdef_class_rep::install_property (const cdef_property& prop)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2210 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2211 property_map[prop.get_name ()] = prop;
15911 b18b7e560236 More flexible refcount to account for owned back-references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15910 diff changeset	2212
b18b7e560236 More flexible refcount to account for owned back-references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15910 diff changeset	2213 member_count++;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2214 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2215
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2216 Cell
19184 e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	2217 cdef_class::cdef_class_rep::get_properties (int mode)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2218 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2219 std::map<std::string,cdef_property> props;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2220
19184 e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	2221 props = get_property_map (mode);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2222
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2223 Cell c (props.size (), 1);
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2224
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2225 int idx = 0;
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2226
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2227 for (const auto& pname_prop : props)
50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2228 c(idx++, 0) = to_ov (pname_prop.second);
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2229
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2230 return c;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2231 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2232
19184 e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	2233 std::map<std::string, cdef_property>
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	2234 cdef_class::cdef_class_rep::get_property_map (int mode)
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	2235 {
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	2236 std::map<std::string,cdef_property> props;
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	2237
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	2238 find_properties (props, mode);
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	2239
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	2240 return props;
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	2241 }
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	2242
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2243 void
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2244 cdef_class::cdef_class_rep::find_properties (std::map<std::string,
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2245 cdef_property>& props,
19184 e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	2246 int mode)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2247 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2248 property_const_iterator it;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2249
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2250 for (it = property_map.begin (); it != property_map.end (); ++it)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2251 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2252 std::string nm = it->second.get_name ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2253
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2254 if (props.find (nm) == props.end ())
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	2255 {
19184 e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	2256 if (mode == property_inherited)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2257 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2258 octave_value acc = it->second.get ("GetAccess");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2259
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2260 if (! acc.is_string ()
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2261 \|\| acc.string_value () == "private")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2262 continue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2263 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2264
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	2265 props[nm] = it->second;
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	2266 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2267 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2268
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2269 // Look into superclasses
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2270
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2271 Cell super_classes = get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2272
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2273 for (int i = 0; i < super_classes.numel (); i++)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2274 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2275 cdef_class cls = lookup_class (super_classes(i));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2276
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2277 cls.get_rep ()->find_properties (props,
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2278 (mode == property_all
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2279 ? property_all
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2280 : property_inherited));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2281 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2282 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2283
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2284 void
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2285 cdef_class::cdef_class_rep::find_names (std::set<std::string>& names,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2286 bool all)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2287 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2288 load_all_methods ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2289
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2290 for (const auto& cls_fnmap : method_map)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2291 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2292 if (! cls_fnmap.second.is_constructor ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2293 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2294 std::string nm = cls_fnmap.second.get_name ();
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2295
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2296 if (! all)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2297 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2298 octave_value acc = cls_fnmap.second.get ("Access");
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2299
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2300 if (! acc.is_string()
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2301 \|\| acc.string_value () != "public")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2302 continue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2303 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2304
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2305 names.insert (nm);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2306 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2307 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2308
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2309 for (const auto& pname_prop : property_map)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2310 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2311 std::string nm = pname_prop.second.get_name ();
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2312
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2313 if (! all)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2314 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2315 octave_value acc = pname_prop.second.get ("GetAccess");
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2316
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2317 if (! acc.is_string()
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2318 \|\| acc.string_value () != "public")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2319 continue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2320 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2321
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2322 names.insert (nm);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2323 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2324
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2325 // Look into superclasses
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2326
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2327 Cell super_classes = get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2328
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2329 for (int i = 0; i < super_classes.numel (); i++)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2330 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2331 cdef_class cls = lookup_class (super_classes(i));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2332
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2333 cls.get_rep ()->find_names (names, all);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2334 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2335 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2336
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2337 string_vector
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2338 cdef_class::cdef_class_rep::get_names (void)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2339 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2340 std::set<std::string> names;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2341
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2342 find_names (names, false);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2343
22374 f38e81248556 ov-classdef.cc: use string_vector constructor for string containers. Carnë Draug <carandraug@octave.org> parents: 22327 diff changeset	2344 string_vector v (names);
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2345
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2346 return v.sort (true);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2347 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2348
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2349 void
25367 0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	2350 cdef_class::cdef_class_rep::delete_object (const cdef_object& obj)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2351 {
25367 0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	2352 cdef_method dtor = find_method ("delete");
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	2353
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	2354 if (dtor.ok ())
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	2355 dtor.execute (obj, octave_value_list (), 0, true, "destructor");
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2356
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2357 // FIXME: should we destroy corresponding properties here?
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2358
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2359 // Call "delete" in super classes
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2360
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2361 Cell super_classes = get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2362
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2363 for (int i = 0; i < super_classes.numel (); i++)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2364 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2365 cdef_class cls = lookup_class (super_classes(i));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2366
25367 0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	2367 if (cls.get_name () != "handle")
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	2368 cls.delete_object (obj);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2369 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2370 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2371
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2372 octave_value_list
15986 14aa0b5a980c Abstract the meta-protocol layer to use it for other meta objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 15968 diff changeset	2373 cdef_class::cdef_class_rep::meta_subsref (const std::string& type,
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2374 const std::list<octave_value_list>& idx,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2375 int nargout)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2376 {
15956 d8553705f8f0 Support calling static methods and getting constant properties. Michael Goffioul <michael.goffioul@gmail.com> parents: 15955 diff changeset	2377 size_t skip = 1;
d8553705f8f0 Support calling static methods and getting constant properties. Michael Goffioul <michael.goffioul@gmail.com> parents: 15955 diff changeset	2378
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2379 octave_value_list retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2380
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2381 switch (type[0])
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2382 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2383 case '(':
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2384 // Constructor call
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2385
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2386 #if DEBUG_TRACE
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2387 std::cerr << "constructor" << std::endl;
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2388 #endif
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2389
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2390 retval(0) = construct (idx.front ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2391 break;
15956 d8553705f8f0 Support calling static methods and getting constant properties. Michael Goffioul <michael.goffioul@gmail.com> parents: 15955 diff changeset	2392
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2393 case '.':
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2394 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2395 // Static method, constant (or property?)
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2396
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2397 #if DEBUG_TRACE
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2398 std::cerr << "static method/property" << std::endl;
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2399 #endif
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2400
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2401 if (idx.front ().length () != 1)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2402 error ("invalid meta.class indexing");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2403
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2404 std::string nm = idx.front ()(0).xstring_value ("invalid meta.class indexing, expected a method or property name");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2405
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2406 cdef_method meth = find_method (nm);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2407
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2408 if (meth.ok ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2409 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2410 if (! meth.is_static ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2411 error ("method `%s' is not static", nm.c_str ());
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2412
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2413 octave_value_list args;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2414
26449 f8107140087c maint: small indentation changes for readability. Rik <rik@octave.org> parents: 26376 diff changeset	2415 if (type.length () > 1 && idx.size () > 1 && type[1] == '(')
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2416 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2417 args = *(++(idx.begin ()));
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2418 skip++;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2419 }
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2420
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2421 retval = meth.execute (args, (type.length () > skip
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2422 ? 1 : nargout), true,
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2423 "meta.class");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2424 }
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2425 else
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2426 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2427 cdef_property prop = find_property (nm);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2428
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2429 if (! prop.ok ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2430 error ("no such method or property `%s'", nm.c_str ());
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2431
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2432 if (! prop.is_constant ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2433 error ("property `%s' is not constant", nm.c_str ());
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2434
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2435 retval(0) = prop.get_value (true, "meta.class");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2436 }
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2437 }
15956 d8553705f8f0 Support calling static methods and getting constant properties. Michael Goffioul <michael.goffioul@gmail.com> parents: 15955 diff changeset	2438 break;
d8553705f8f0 Support calling static methods and getting constant properties. Michael Goffioul <michael.goffioul@gmail.com> parents: 15955 diff changeset	2439
d8553705f8f0 Support calling static methods and getting constant properties. Michael Goffioul <michael.goffioul@gmail.com> parents: 15955 diff changeset	2440 default:
20428 7ac907da9fba Use error() rather than ::error() unless explicitly required. Rik <rik@octave.org> parents: 20193 diff changeset	2441 error ("invalid meta.class indexing");
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2442 break;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2443 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2444
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2445 if (type.length () > skip && idx.size () > skip && ! retval.empty ())
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2446 retval = retval(0).next_subsref (nargout, type, idx, skip);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2447
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2448 return retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2449 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2450
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2451 void
15986 14aa0b5a980c Abstract the meta-protocol layer to use it for other meta objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 15968 diff changeset	2452 cdef_class::cdef_class_rep::meta_release (void)
14aa0b5a980c Abstract the meta-protocol layer to use it for other meta objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 15968 diff changeset	2453 {
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	2454 cdef_manager& cdm
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	2455 = octave::__get_cdef_manager__ ("cdef_class::cdef_class_rep::meta_release");
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	2456
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	2457 cdm.unregister_class (wrap ());
15986 14aa0b5a980c Abstract the meta-protocol layer to use it for other meta objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 15968 diff changeset	2458 }
14aa0b5a980c Abstract the meta-protocol layer to use it for other meta objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 15968 diff changeset	2459
14aa0b5a980c Abstract the meta-protocol layer to use it for other meta objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 15968 diff changeset	2460 void
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2461 cdef_class::cdef_class_rep::initialize_object (cdef_object& obj)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2462 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2463 // Populate the object with default property values
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2464
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2465 std::list<cdef_class> super_classes = lookup_classes (
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2466 get ("SuperClasses").cell_value ());
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2467
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2468 for (auto& cls : super_classes)
50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2469 cls.initialize_object (obj);
50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2470
50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2471 for (const auto& pname_prop : property_map)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2472 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2473 if (! pname_prop.second.get ("Dependent").bool_value ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2474 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2475 octave_value pvalue = pname_prop.second.get ("DefaultValue");
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2476
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2477 if (pvalue.is_defined ())
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2478 obj.put (pname_prop.first, pvalue);
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2479 else
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2480 obj.put (pname_prop.first, octave_value (Matrix ()));
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2481 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2482 }
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2483
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2484 refcount++;
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2485 obj.mark_for_construction (cdef_class (this));
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2486 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2487
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2488 void
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2489 cdef_class::cdef_class_rep::run_constructor (cdef_object& obj,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2490 const octave_value_list& args)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2491 {
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2492 octave_value_list empty_args;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2493
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2494 for (const auto& cls : implicit_ctor_list)
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2495 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2496 cdef_class supcls = lookup_class (cls);
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2497
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2498 supcls.run_constructor (obj, empty_args);
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2499 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2500
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2501 std::string cls_name = get_name ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2502 std::string ctor_name = get_base_name (cls_name);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2503
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2504 cdef_method ctor = find_method (ctor_name);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2505
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2506 if (ctor.ok ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2507 {
15968 cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	2508 octave_value_list ctor_args (args);
cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	2509 octave_value_list ctor_retval;
cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	2510
cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	2511 ctor_args.prepend (to_ov (obj));
cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	2512 ctor_retval = ctor.execute (ctor_args, 1, true, "constructor");
cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	2513
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2514 if (ctor_retval.length () != 1)
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	2515 error ("%s: invalid number of output arguments for classdef constructor",
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	2516 ctor_name.c_str ());
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2517
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2518 obj = to_cdef (ctor_retval(0));
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2519 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2520
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2521 obj.mark_as_constructed (wrap ());
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2522 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2523
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2524 octave_value
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2525 cdef_class::cdef_class_rep::construct (const octave_value_list& args)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2526 {
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2527 cdef_object obj = construct_object (args);
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2528
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2529 if (obj.ok ())
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2530 return to_ov (obj);
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2531
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2532 return octave_value ();
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2533 }
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2534
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2535 cdef_object
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2536 cdef_class::cdef_class_rep::construct_object (const octave_value_list& args)
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2537 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2538 if (is_abstract ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2539 error ("cannot instantiate object for abstract class `%s'",
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2540 get_name ().c_str ());
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2541
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2542 cdef_object obj;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2543
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2544 if (is_meta_class ())
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2545 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2546 // This code path is only used to create empty meta objects
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2547 // as filler for the empty values within a meta object array.
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2548
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2549 cdef_class this_cls = wrap ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2550
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2551 static cdef_object empty_class;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2552
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	2553 cdef_manager& cdm
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	2554 = octave::__get_cdef_manager__ ("cdef_class::cdef_class_rep::construct_object");
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	2555
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	2556 if (this_cls == cdm.meta_class ())
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2557 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2558 if (! empty_class.ok ())
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2559 empty_class = cdm.make_class ("", std::list<cdef_class> ());
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2560 obj = empty_class;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2561 }
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	2562 else if (this_cls == cdm.meta_property ())
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2563 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2564 static cdef_property empty_property;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2565
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2566 if (! empty_class.ok ())
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2567 empty_class = cdm.make_class ("", std::list<cdef_class> ());
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2568 if (! empty_property.ok ())
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2569 empty_property = cdm.make_property (empty_class, "");
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2570 obj = empty_property;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2571 }
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	2572 else if (this_cls == cdm.meta_method ())
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2573 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2574 static cdef_method empty_method;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2575
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2576 if (! empty_class.ok ())
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2577 empty_class = cdm.make_class ("", std::list<cdef_class> ());
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2578 if (! empty_method.ok ())
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2579 empty_method = cdm.make_method (empty_class, "", octave_value ());
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2580 obj = empty_method;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2581 }
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	2582 else if (this_cls == cdm.meta_package ())
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2583 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2584 static cdef_package empty_package;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2585
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2586 if (! empty_package.ok ())
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2587 empty_package = cdm.make_package ("");
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2588 obj = empty_package;
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2589 }
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2590 else
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2591 panic_impossible ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2592
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2593 return obj;
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2594 }
15870 2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	2595 else
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2596 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2597 if (is_handle_class ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2598 obj = cdef_object (new handle_cdef_object ());
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2599 else
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2600 obj = cdef_object (new value_cdef_object ());
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2601 obj.set_class (wrap ());
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2602
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2603 initialize_object (obj);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2604
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2605 run_constructor (obj, args);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2606
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2607 return obj;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2608 }
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2609
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2610 return cdef_object ();
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2611 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2612
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2613 static octave_value
23533 8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2614 compute_attribute_value (octave::tree_evaluator& tw,
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23445 diff changeset	2615 octave::tree_classdef_attribute *t)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2616 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	2617 octave::tree_expression *expr = t->expression ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	2618
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	2619 if (expr)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2620 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	2621 if (expr->is_identifier ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2622 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	2623 std::string s = expr->name ();
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2624
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2625 if (s == "public")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2626 return std::string ("public");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2627 else if (s == "protected")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2628 return std::string ("protected");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2629 else if (s == "private")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2630 return std::string ("private");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2631 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2632
23533 8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2633 return tw.evaluate (expr);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2634 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2635 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2636 return octave_value (true);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2637 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2638
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21127 diff changeset	2639 template <typename T>
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2640 static std::string
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23445 diff changeset	2641 attribute_value_to_string (T *t, octave_value v)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2642 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2643 if (v.is_string ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2644 return v.string_value ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2645 else if (t->expression ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2646 return t->expression ()->original_text ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2647 else
23829 01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23826 diff changeset	2648 return "true";
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2649 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2650
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2651 cdef_class
23533 8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2652 cdef_class::make_meta_class (octave::interpreter& interp,
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23445 diff changeset	2653 octave::tree_classdef *t, bool is_at_folder)
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2654 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2655 cdef_class retval;
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	2656 std::string class_name, full_class_name;
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2657
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2658 // Class creation
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2659
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	2660 class_name = full_class_name = t->ident ()->name ();
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	2661 if (! t->package_name ().empty ())
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23693 diff changeset	2662 full_class_name = t->package_name () + '.' + full_class_name;
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2663
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2664 #if DEBUG_TRACE
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2665 std::cerr << "class: " << full_class_name << std::endl;
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2666 #endif
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2667
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2668 std::list<cdef_class> slist;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2669
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2670 if (t->superclass_list ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2671 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2672 for (auto& scls : (*t->superclass_list ()))
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2673 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2674 std::string sclass_name = (scls)->class_name ();
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2675
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2676 #if DEBUG_TRACE
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2677 std::cerr << "superclass: " << sclass_name << std::endl;
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2678 #endif
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2679
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2680 cdef_class sclass = lookup_class (sclass_name);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2681
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2682 if (sclass.get ("Sealed").bool_value ())
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	2683 error ("`%s' cannot inherit from `%s', because it is sealed",
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	2684 full_class_name.c_str (), sclass_name.c_str ());
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2685
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2686 slist.push_back (sclass);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2687 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2688 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2689
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2690 cdef_manager& cdm
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2691 = octave::__get_cdef_manager__ ("cdef_class::make_meta_class");
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2692
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2693 retval = cdm.make_class (full_class_name, slist);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2694
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	2695 // Package owning this class
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	2696
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	2697 if (! t->package_name ().empty ())
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	2698 {
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	2699 cdef_package pack = cdm.find_package (t->package_name ());
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	2700
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2701 if (pack.ok ())
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	2702 retval.put ("ContainingPackage", to_ov (pack));
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	2703 }
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	2704
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2705 // Class attributes
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2706
23533 8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2707 octave::tree_evaluator& tw = interp.get_evaluator ();
8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2708
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2709 if (t->attribute_list ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2710 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2711 for (const auto& attr : (*t->attribute_list ()))
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2712 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2713 std::string aname = attr->ident ()->name ();
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	2714 octave_value avalue = compute_attribute_value (tw, attr);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2715
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2716 #if DEBUG_TRACE
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2717 std::cerr << "class attribute: " << aname << " = "
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2718 << attribute_value_to_string (attr, avalue) << std::endl;
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2719 #endif
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2720
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2721 retval.put (aname, avalue);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2722 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2723 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2724
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23445 diff changeset	2725 octave::tree_classdef_body *b = t->body ();
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2726
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2727 if (b)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2728 {
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21724 diff changeset	2729 // Keep track of the get/set accessor methods. They will be used
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2730 // later on when creating properties.
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2731
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2732 std::map<std::string, octave_value> get_methods;
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2733 std::map<std::string, octave_value> set_methods;
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2734
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2735 // Method blocks
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2736
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2737 std::list<octave::tree_classdef_methods_block *> mb_list = b->methods_list ();
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2738
23533 8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2739 octave::load_path& lp = interp.get_load_path ();
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	2740
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2741 for (auto& mb_p : mb_list)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2742 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2743 std::map<std::string, octave_value> amap;
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2744
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2745 #if DEBUG_TRACE
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2746 std::cerr << "method block" << std::endl;
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2747 #endif
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2748
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2749 // Method attributes
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2750
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2751 if (mb_p->attribute_list ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2752 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2753 for (auto& attr_p : *mb_p->attribute_list ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2754 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2755 std::string aname = attr_p->ident ()->name ();
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	2756 octave_value avalue = compute_attribute_value (tw, attr_p);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2757
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2758 #if DEBUG_TRACE
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2759 std::cerr << "method attribute: " << aname << " = "
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2760 << attribute_value_to_string (attr_p, avalue)
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2761 << std::endl;
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2762 #endif
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2763
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2764 amap[aname] = avalue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2765 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2766 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2767
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2768 // Methods
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2769
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2770 if (mb_p->element_list ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2771 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2772 for (auto& mtd : *mb_p->element_list ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2773 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2774 std::string mname = mtd.function_value ()->name ();
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2775 std::string mprefix = mname.substr (0, 4);
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2776
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2777 if (mprefix == "get.")
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2778 get_methods[mname.substr (4)] =
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23693 diff changeset	2779 make_fcn_handle (mtd, full_class_name + '>' + mname);
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2780 else if (mprefix == "set.")
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2781 set_methods[mname.substr (4)] =
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23693 diff changeset	2782 make_fcn_handle (mtd, full_class_name + '>' + mname);
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2783 else
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2784 {
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2785 cdef_method meth = cdm.make_method (retval, mname, mtd);
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2786
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2787 #if DEBUG_TRACE
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2788 std::cerr << (mname == class_name ? "constructor"
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2789 : "method")
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2790 << ": " << mname << std::endl;
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2791 #endif
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2792
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2793 for (auto& attrnm_val : amap)
50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2794 meth.put (attrnm_val.first, attrnm_val.second);
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2795
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2796 retval.install_method (meth);
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2797 }
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2798 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2799 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2800 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2801
18263 b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2802 if (is_at_folder)
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2803 {
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2804 // Look for all external methods visible on octave path at the
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2805 // time of loading of the class.
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2806 //
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2807 // FIXME: This is an "extension" to Matlab behavior, which only looks
50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2808 // in the @-folder containing the original classdef file. However,
50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2809 // this is easier to implement it that way at the moment.
18263 b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2810
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	2811 std::list<std::string> external_methods
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	2812 = lp.methods (full_class_name);
18263 b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2813
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2814 for (const auto& mtdnm : external_methods)
18263 b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2815 {
21578 683a1beee538 maint: Use "FIXME:" for all code blocks needing further attention. Rik <rik@octave.org> parents: 21574 diff changeset	2816 // FIXME: should we issue a warning if the method is already
18263 b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2817 // defined in the classdef file?
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2818
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2819 if (mtdnm != class_name
50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2820 && ! retval.find_method (mtdnm, true).ok ())
18263 b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2821 {
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2822 // Create a dummy method that is used until the actual
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2823 // method is loaded.
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2824 octave_user_function *fcn = new octave_user_function ();
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2825
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2826 fcn->stash_function_name (mtdnm);
50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2827
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2828 cdef_method meth
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2829 = cdm.make_method (retval, mtdnm, octave_value (fcn));
18263 b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2830
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2831 retval.install_method (meth);
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2832 }
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2833 }
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2834 }
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2835
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2836 // Property blocks
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2837
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2838 // FIXME: default property expression should be able to call static
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21724 diff changeset	2839 // methods of the class being constructed. A restricted CLASSNAME
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2840 // symbol should be added to the scope before evaluating default
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2841 // value expressions.
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2842
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2843 std::list<octave::tree_classdef_properties_block *> pb_list
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2844 = b->properties_list ();
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2845
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2846 for (auto& pb_p : pb_list)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2847 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2848 std::map<std::string, octave_value> amap;
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2849
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2850 #if DEBUG_TRACE
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2851 std::cerr << "property block" << std::endl;
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2852 #endif
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2853
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2854 // Property attributes
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2855
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2856 if (pb_p->attribute_list ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2857 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2858 for (auto& attr_p : *pb_p->attribute_list ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2859 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2860 std::string aname = attr_p->ident ()->name ();
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	2861 octave_value avalue = compute_attribute_value (tw, attr_p);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2862
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2863 #if DEBUG_TRACE
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2864 std::cerr << "property attribute: " << aname << " = "
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2865 << attribute_value_to_string (attr_p, avalue)
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2866 << std::endl;
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2867 #endif
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2868
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2869 if (aname == "Access")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2870 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2871 amap["GetAccess"] = avalue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2872 amap["SetAccess"] = avalue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2873 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2874 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2875 amap[aname] = avalue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2876 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2877 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2878
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2879 // Properties
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2880
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2881 if (pb_p->element_list ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2882 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2883 for (auto& prop_p : *pb_p->element_list ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2884 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2885 std::string prop_name = prop_p->ident ()->name ();
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2886
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2887 cdef_property prop = cdm.make_property (retval, prop_name);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2888
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2889 #if DEBUG_TRACE
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2890 std::cerr << "property: " << prop_p->ident ()->name ()
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2891 << std::endl;
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2892 #endif
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2893
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	2894 octave::tree_expression *expr = prop_p->expression ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	2895 if (expr)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2896 {
23533 8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2897 octave_value pvalue = tw.evaluate (expr);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2898
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2899 #if DEBUG_TRACE
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2900 std::cerr << "property default: "
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2901 << attribute_value_to_string (*pit, pvalue)
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2902 << std::endl;
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2903 #endif
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2904
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2905 prop.put ("DefaultValue", pvalue);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2906 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2907
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2908 // Install property attributes. This is done before assigning
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2909 // the property accessors so we can do validation by using
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2910 // cdef_property methods.
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2911
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2912 for (auto& attrnm_val : amap)
50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2913 prop.put (attrnm_val.first, attrnm_val.second);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2914
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21724 diff changeset	2915 // Install property access methods, if any. Remove the
20181 aa36fb998a4d maint: Remove unnecessary whitespace at end of lines. Rik <rik@octave.org> parents: 20125 diff changeset	2916 // accessor methods from the temporary storage map, so we can
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2917 // detect which ones are invalid and do not correspond to a
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2918 // defined property.
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2919
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25321 diff changeset	2920 auto git = get_methods.find (prop_name);
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2921
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2922 if (git != get_methods.end ())
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2923 {
18462 00ba456b9aa8 Fix dispatch class of property accessor methods. Michael Goffioul <michael.goffioul@gmail.com> parents: 18441 diff changeset	2924 make_function_of_class (retval, git->second);
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2925 prop.put ("GetMethod", git->second);
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2926 get_methods.erase (git);
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2927 }
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2928
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25321 diff changeset	2929 auto sit = set_methods.find (prop_name);
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2930
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2931 if (sit != set_methods.end ())
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2932 {
18462 00ba456b9aa8 Fix dispatch class of property accessor methods. Michael Goffioul <michael.goffioul@gmail.com> parents: 18441 diff changeset	2933 make_function_of_class (retval, sit->second);
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2934 prop.put ("SetMethod", sit->second);
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2935 set_methods.erase (sit);
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2936 }
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2937
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2938 retval.install_property (prop);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2939 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2940 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2941 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2942 }
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2943
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2944 return retval;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2945 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2946
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2947 octave_function*
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2948 cdef_class::get_method_function (const std::string& /* nm */)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2949 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23445 diff changeset	2950 octave_classdef_meta p = new octave_classdef_meta (this);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2951
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2952 return p;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2953 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2954
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2955 octave_value
15968 cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	2956 cdef_property::cdef_property_rep::get_value (const cdef_object& obj,
cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	2957 bool do_check_access,
cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	2958 const std::string& who)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2959 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2960 octave_value retval;
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2961
15968 cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	2962 if (do_check_access && ! check_get_access ())
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21055 diff changeset	2963 err_property_access (who, wrap (), false);
15968 cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	2964
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2965 if (! obj.is_constructed ())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2966 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2967 cdef_class cls (to_cdef (get ("DefiningClass")));
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2968
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2969 if (! obj.is_partially_constructed_for (cls))
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2970 error ("cannot reference properties of class `%s' for non-constructed object",
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2971 cls.get_name ().c_str ());
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2972 }
19597 db92e7e28e1f strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19343 diff changeset	2973
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2974 octave_value get_fcn = get ("GetMethod");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2975
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2976 // FIXME: should check whether we're already in get accessor method
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2977
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23576 diff changeset	2978 if (get_fcn.isempty () \|\| is_method_executing (get_fcn, obj))
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2979 retval = obj.get (get ("Name").string_value ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2980 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2981 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2982 octave_value_list args;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2983
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2984 args(0) = to_ov (obj);
19597 db92e7e28e1f strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19343 diff changeset	2985
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23503 diff changeset	2986 args = octave::feval (get_fcn, args, 1);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2987
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2988 retval = args(0);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2989 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2990
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2991 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2992 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2993
15968 cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	2994 octave_value
cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	2995 cdef_property::cdef_property_rep::get_value (bool do_check_access,
cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	2996 const std::string& who)
cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	2997 {
cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	2998 if (do_check_access && ! check_get_access ())
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21055 diff changeset	2999 err_property_access (who, wrap (), false);
15968 cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	3000
cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	3001 return get ("DefaultValue");
cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	3002 }
cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	3003
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3004 bool
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3005 cdef_property::cdef_property_rep::is_recursive_set (const cdef_object& /* obj */) const
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3006 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3007 // FIXME: implement
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3008 return false;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3009 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3010
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3011 void
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3012 cdef_property::cdef_property_rep::set_value (cdef_object& obj,
15968 cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	3013 const octave_value& val,
cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	3014 bool do_check_access,
cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	3015 const std::string& who)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3016 {
15968 cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	3017 if (do_check_access && ! check_set_access ())
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21055 diff changeset	3018 err_property_access (who, wrap (), true);
15968 cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	3019
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	3020 if (! obj.is_constructed ())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	3021 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	3022 cdef_class cls (to_cdef (get ("DefiningClass")));
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	3023
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	3024 if (! obj.is_partially_constructed_for (cls))
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3025 error ("cannot reference properties of class `%s' for non-constructed object",
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3026 cls.get_name ().c_str ());
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	3027 }
19597 db92e7e28e1f strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19343 diff changeset	3028
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3029 octave_value set_fcn = get ("SetMethod");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3030
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23576 diff changeset	3031 if (set_fcn.isempty () \|\| is_method_executing (set_fcn, obj))
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	3032 obj.put (get ("Name").string_value (), val);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3033 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3034 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3035 octave_value_list args;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3036
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3037 args(0) = to_ov (obj);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3038 args(1) = val;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3039
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23503 diff changeset	3040 args = octave::feval (set_fcn, args, 1);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3041
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3042 if (args.length () > 0 && args(0).is_defined ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3043 {
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3044 if (args (0).is_classdef_object ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3045 {
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3046 cdef_object new_obj = to_cdef (args(0));
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3047
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3048 obj = new_obj;
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3049 }
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3050 else
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3051 ::warning ("set-method of property `%s' returned a non-classdef object",
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3052 get_name ().c_str ());
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3053 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3054 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3055 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3056
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3057 bool
15968 cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	3058 cdef_property::cdef_property_rep::check_get_access (void) const
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3059 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3060 cdef_class cls (to_cdef (get ("DefiningClass")));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3061
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20979 diff changeset	3062 return ::check_access (cls, get ("GetAccess"), "",
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3063 get_name (), false);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3064
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3065 return false;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3066 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3067
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3068 bool
15968 cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	3069 cdef_property::cdef_property_rep::check_set_access (void) const
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3070 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3071 cdef_class cls (to_cdef (get ("DefiningClass")));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3072
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20979 diff changeset	3073 return ::check_access (cls, get ("SetAccess"), "",
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3074 get_name (), true);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3075
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3076 return false;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3077 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3078
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3079 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3080 cdef_method::cdef_method_rep::check_method (void)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3081 {
18263 b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3082 if (is_external ())
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3083 {
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3084 if (is_dummy_method (function))
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3085 {
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	3086 octave::load_path& lp
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	3087 = octave::__get_load_path__ ("cdef_method::cdef_method_rep::check_method");
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	3088
18263 b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3089 std::string name = get_name ();
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3090 std::string cls_name = dispatch_type;
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3091 std::string pack_name;
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3092
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3093 size_t pos = cls_name.rfind ('.');
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3094
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3095 if (pos != std::string::npos)
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3096 {
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3097 pack_name = cls_name.substr (0, pos);
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3098 cls_name = cls_name.substr (pos + 1);
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3099 }
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3100
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3101 std::string dir_name;
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	3102 std::string file_name = lp.find_method (cls_name, name,
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	3103 dir_name, pack_name);
18263 b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3104
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3105 if (! file_name.empty ())
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3106 {
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23652 diff changeset	3107 octave_value ov_fcn
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23652 diff changeset	3108 = octave::load_fcn_from_file (file_name, dir_name,
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23652 diff changeset	3109 dispatch_type, pack_name);
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23652 diff changeset	3110
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23652 diff changeset	3111 if (ov_fcn.is_defined ())
18263 b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3112 {
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23652 diff changeset	3113 function = ov_fcn;
18263 b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3114
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3115 make_function_of_class (dispatch_type, function);
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3116 }
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3117 }
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3118 }
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3119 else
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3120 {
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3121 // FIXME: check out-of-date status
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3122 }
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3123
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3124 if (is_dummy_method (function))
20428 7ac907da9fba Use error() rather than ::error() unless explicitly required. Rik <rik@octave.org> parents: 20193 diff changeset	3125 error ("no definition found for method `%s' of class `%s'",
7ac907da9fba Use error() rather than ::error() unless explicitly required. Rik <rik@octave.org> parents: 20193 diff changeset	3126 get_name ().c_str (), dispatch_type.c_str ());
18263 b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3127 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3128 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3129
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3130 octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3131 cdef_method::cdef_method_rep::execute (const octave_value_list& args,
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	3132 int nargout, bool do_check_access,
15968 cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	3133 const std::string& who)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3134 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3135 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3136
15968 cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	3137 if (do_check_access && ! check_access ())
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21055 diff changeset	3138 err_method_access (who, wrap ());
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3139
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3140 if (get ("Abstract").bool_value ())
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3141 error ("%s: cannot execute abstract method",
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	3142 get ("Name").string_value ().c_str ());
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3143
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3144 check_method ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3145
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3146 if (function.is_defined ())
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23503 diff changeset	3147 retval = octave::feval (function, args, nargout);
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3148
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3149 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3150 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3151
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3152 octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3153 cdef_method::cdef_method_rep::execute (const cdef_object& obj,
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	3154 const octave_value_list& args,
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	3155 int nargout, bool do_check_access,
15968 cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	3156 const std::string& who)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3157 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3158 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3159
15968 cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	3160 if (do_check_access && ! check_access ())
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21055 diff changeset	3161 err_method_access (who, wrap ());
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3162
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3163 if (get ("Abstract").bool_value ())
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3164 error ("%s: cannot execute abstract method",
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	3165 get ("Name").string_value ().c_str ());
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3166
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3167 check_method ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3168
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3169 if (function.is_defined ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3170 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3171 octave_value_list new_args;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3172
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3173 new_args.resize (args.length () + 1);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3174
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3175 new_args(0) = to_ov (obj);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3176 for (int i = 0; i < args.length (); i++)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3177 new_args(i+1) = args(i);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3178
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23503 diff changeset	3179 retval = octave::feval (function, new_args, nargout);
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3180 }
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3181
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3182 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3183 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3184
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3185 bool
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	3186 cdef_method::cdef_method_rep::is_constructor (void) const
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	3187 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	3188 if (function.is_function())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	3189 return function.function_value ()->is_classdef_constructor ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	3190
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	3191 return false;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	3192 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	3193
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	3194 bool
15968 cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	3195 cdef_method::cdef_method_rep::check_access (void) const
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3196 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3197 cdef_class cls (to_cdef (get ("DefiningClass")));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3198
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3199 return ::check_access (cls, get ("Access"), get_name ());
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3200 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3201
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3202 octave_value_list
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3203 cdef_method::cdef_method_rep::meta_subsref
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3204 (const std::string& type, const std::list<octave_value_list>& idx,
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3205 int nargout)
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3206 {
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3207 octave_value_list retval;
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3208
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3209 switch (type[0])
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3210 {
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3211 case '(':
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	3212 retval = (execute (idx.front (), type.length () > 1 ? 1 : nargout, true));
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3213 break;
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3214
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3215 default:
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3216 error ("invalid meta.method indexing");
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3217 break;
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3218 }
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3219
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3220 if (type.length () > 1 && idx.size () > 1 && ! retval.empty ())
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3221 retval = retval(0).next_subsref (nargout, type, idx, 1);
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3222
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3223 return retval;
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3224 }
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3225
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3226 static cdef_package
24100 4d9ceaf17dda return empty matrix if meta..fromName fails (bug #52096) Piotr Held <pjheld@gmail.com>* parents: 23865 diff changeset	3227 lookup_package (const std::string& name, bool error_if_not_found = true,
4d9ceaf17dda return empty matrix if meta..fromName fails (bug #52096) Piotr Held <pjheld@gmail.com>* parents: 23865 diff changeset	3228 bool load_if_not_found = true)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3229 {
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3230 cdef_manager& cdm = octave::__get_cdef_manager__ ("lookup_package");
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3231
24100 4d9ceaf17dda return empty matrix if meta..fromName fails (bug #52096) Piotr Held <pjheld@gmail.com>* parents: 23865 diff changeset	3232 return cdm.find_package (name, error_if_not_found, load_if_not_found);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3233 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3234
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3235 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3236 package_fromName (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3237 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3238 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3239
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3240 if (args.length () != 1)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3241 error ("fromName: invalid number of parameters");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3242
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3243 std::string name = args(0).xstring_value ("fromName: PACKAGE_NAME must be a string");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3244
24100 4d9ceaf17dda return empty matrix if meta..fromName fails (bug #52096) Piotr Held <pjheld@gmail.com>* parents: 23865 diff changeset	3245 retval(0) = to_ov (lookup_package (name, false));
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3246
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3247 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3248 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3249
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3250 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3251 package_get_classes (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3252 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3253 octave_value_list retval (1, Matrix ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3254
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3255 if (args.length () == 1 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3256 && args(0).class_name () == "meta.package")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3257 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3258 cdef_package pack (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3259
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3260 retval(0) = pack.get_classes ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3261 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3262
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3263 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3264 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3265
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3266 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3267 package_get_functions (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3268 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3269 octave_value_list retval (1, Matrix ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3270
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3271 if (args.length () == 0 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3272 && args(0).class_name () == "meta.package")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3273 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3274 cdef_package pack (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3275
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3276 retval(0) = pack.get_functions ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3277 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3278
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3279 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3280 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3281
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3282 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3283 package_get_packages (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3284 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3285 octave_value_list retval (1, Matrix ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3286
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3287 if (args.length () == 0 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3288 && args(0).class_name () == "meta.package")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3289 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3290 cdef_package pack (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3291
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3292 retval(0) = pack.get_packages ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3293 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3294
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3295 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3296 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3297
16690 1c45e22fc444 Implement meta.package.getAllPackages() method. Michael Goffioul <michael.goffioul@gmail.com> parents: 16689 diff changeset	3298 static octave_value_list
23533 8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	3299 package_getAllPackages (octave::interpreter& interp,
8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	3300 const octave_value_list& /* args /, int / nargout */)
16690 1c45e22fc444 Implement meta.package.getAllPackages() method. Michael Goffioul <michael.goffioul@gmail.com> parents: 16689 diff changeset	3301 {
1c45e22fc444 Implement meta.package.getAllPackages() method. Michael Goffioul <michael.goffioul@gmail.com> parents: 16689 diff changeset	3302 std::map<std::string, cdef_package> toplevel_packages;
1c45e22fc444 Implement meta.package.getAllPackages() method. Michael Goffioul <michael.goffioul@gmail.com> parents: 16689 diff changeset	3303
23533 8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	3304 octave::load_path& lp = interp.get_load_path ();
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	3305
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	3306 std::list<std::string> names = lp.get_all_package_names ();
16690 1c45e22fc444 Implement meta.package.getAllPackages() method. Michael Goffioul <michael.goffioul@gmail.com> parents: 16689 diff changeset	3307
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3308 cdef_manager& cdm = octave::__get_cdef_manager__ ("package_getAllPackages");
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3309
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3310 toplevel_packages["meta"] = cdm.find_package ("meta", false, false);
16690 1c45e22fc444 Implement meta.package.getAllPackages() method. Michael Goffioul <michael.goffioul@gmail.com> parents: 16689 diff changeset	3311
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	3312 for (const auto& nm : names)
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3313 toplevel_packages[nm] = cdm.find_package (nm, false, true);
16690 1c45e22fc444 Implement meta.package.getAllPackages() method. Michael Goffioul <michael.goffioul@gmail.com> parents: 16689 diff changeset	3314
1c45e22fc444 Implement meta.package.getAllPackages() method. Michael Goffioul <michael.goffioul@gmail.com> parents: 16689 diff changeset	3315 Cell c (toplevel_packages.size (), 1);
1c45e22fc444 Implement meta.package.getAllPackages() method. Michael Goffioul <michael.goffioul@gmail.com> parents: 16689 diff changeset	3316
1c45e22fc444 Implement meta.package.getAllPackages() method. Michael Goffioul <michael.goffioul@gmail.com> parents: 16689 diff changeset	3317 int i = 0;
1c45e22fc444 Implement meta.package.getAllPackages() method. Michael Goffioul <michael.goffioul@gmail.com> parents: 16689 diff changeset	3318
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	3319 for (const auto& nm_pkg : toplevel_packages)
50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	3320 c(i++,0) = to_ov (nm_pkg.second);
16690 1c45e22fc444 Implement meta.package.getAllPackages() method. Michael Goffioul <michael.goffioul@gmail.com> parents: 16689 diff changeset	3321
1c45e22fc444 Implement meta.package.getAllPackages() method. Michael Goffioul <michael.goffioul@gmail.com> parents: 16689 diff changeset	3322 return octave_value_list (octave_value (c));
1c45e22fc444 Implement meta.package.getAllPackages() method. Michael Goffioul <michael.goffioul@gmail.com> parents: 16689 diff changeset	3323 }
1c45e22fc444 Implement meta.package.getAllPackages() method. Michael Goffioul <michael.goffioul@gmail.com> parents: 16689 diff changeset	3324
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3325 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3326 cdef_package::cdef_package_rep::install_class (const cdef_class& cls,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3327 const std::string& nm)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3328 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3329 class_map[nm] = cls;
15911 b18b7e560236 More flexible refcount to account for owned back-references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15910 diff changeset	3330
b18b7e560236 More flexible refcount to account for owned back-references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15910 diff changeset	3331 member_count++;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3332 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3333
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3334 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3335 cdef_package::cdef_package_rep::install_function (const octave_value& fcn,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3336 const std::string& nm)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3337 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3338 function_map[nm] = fcn;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3339 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3340
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3341 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3342 cdef_package::cdef_package_rep::install_package (const cdef_package& pack,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3343 const std::string& nm)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3344 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3345 package_map[nm] = pack;
15911 b18b7e560236 More flexible refcount to account for owned back-references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15910 diff changeset	3346
b18b7e560236 More flexible refcount to account for owned back-references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15910 diff changeset	3347 member_count++;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3348 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3349
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21127 diff changeset	3350 template <typename T1, typename T2>
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3351 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3352 map2Cell (const std::map<T1, T2>& m)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3353 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3354 Cell retval (1, m.size ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3355 int i = 0;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3356
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25321 diff changeset	3357 for (auto it = m.begin (); it != m.end (); ++it, ++i)
25342 416856765a55 be more careful with using auto in place of explicit const iterator decls John W. Eaton <jwe@octave.org> parents: 25337 diff changeset	3358 retval(i) = to_ov (it->second);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3359
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3360 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3361 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3362
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3363 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3364 cdef_package::cdef_package_rep::get_classes (void) const
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3365 { return map2Cell (class_map); }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3366
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3367 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3368 cdef_package::cdef_package_rep::get_functions (void) const
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3369 { return map2Cell (function_map); }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3370
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3371 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3372 cdef_package::cdef_package_rep::get_packages (void) const
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3373 { return map2Cell (package_map); }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3374
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3375 octave_value
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3376 cdef_package::cdef_package_rep::find (const std::string& nm)
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3377 {
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23693 diff changeset	3378 std::string symbol_name = get_name () + '.' + nm;
16684 edbb123cbe3a Correct handling of package context in symbol table. Michael Goffioul <michael.goffioul@gmail.com> parents: 16676 diff changeset	3379
26065 2eb71b83d3e2 partially refactor function lookup in symbol table John W. Eaton <jwe@octave.org> parents: 26041 diff changeset	3380 octave::symbol_scope curr_scope
2eb71b83d3e2 partially refactor function lookup in symbol table John W. Eaton <jwe@octave.org> parents: 26041 diff changeset	3381 = octave::__get_current_scope__ ("cdef_package::cdef_package_rep::find");
2eb71b83d3e2 partially refactor function lookup in symbol table John W. Eaton <jwe@octave.org> parents: 26041 diff changeset	3382
26119 1dd0e16b82e3 eliminate some unnecessary function arguments John W. Eaton <jwe@octave.org> parents: 26066 diff changeset	3383 return curr_scope.find (symbol_name);
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3384 }
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3385
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3386 octave_value_list
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3387 cdef_package::cdef_package_rep::meta_subsref
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3388 (const std::string& type, const std::list<octave_value_list>& idx,
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3389 int nargout)
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3390 {
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3391 octave_value_list retval;
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3392
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3393 switch (type[0])
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3394 {
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3395 case '.':
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3396 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3397 if (idx.front ().length () != 1)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3398 error ("invalid meta.package indexing");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3399
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3400 std::string nm = idx.front ()(0).xstring_value ("invalid meta.package indexing, expected a symbol name");
20580 729a85dafba8 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20563 diff changeset	3401
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	3402 #if DEBUG_TRACE
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3403 std::cerr << "meta.package query: " << nm << std::endl;
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	3404 #endif
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3405
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3406 octave_value o = find (nm);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3407
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3408 if (! o.is_defined ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3409 error ("member `%s' in package `%s' does not exist",
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3410 nm.c_str (), get_name ().c_str ());
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3411
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3412 if (o.is_function ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3413 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23445 diff changeset	3414 octave_function *fcn = o.function_value ();
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3415
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3416 // NOTE: the case where the package query is the last
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3417 // part of this subsref index is handled in the parse
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3418 // tree, because there is some logic to handle magic
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3419 // "end" that makes it impossible to execute the
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3420 // function call at this stage.
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3421
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3422 if (type.size () > 1
23503 6a2fed2d39ac improve some function names John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	3423 && ! fcn->accepts_postfix_index (type[1]))
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3424 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3425 octave_value_list tmp_args;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3426
23501 1ee4b394a687 use feval instead of do_multi_index_op John W. Eaton <jwe@octave.org> parents: 23476 diff changeset	3427 retval = octave::feval (o, tmp_args, nargout);
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3428 }
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3429 else
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3430 retval(0) = o;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3431
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3432 if (type.size () > 1 && idx.size () > 1)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3433 retval = retval(0).next_subsref (nargout, type,
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3434 idx, 1);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3435 }
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3436 else if (type.size () > 1 && idx.size () > 1)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3437 retval = o.next_subsref (nargout, type, idx, 1);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3438 else
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3439 retval(0) = o;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3440 }
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3441 break;
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3442
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3443 default:
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3444 error ("invalid meta.package indexing");
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3445 break;
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3446 }
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3447
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3448 return retval;
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3449 }
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3450
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3451 void
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3452 cdef_package::cdef_package_rep::meta_release (void)
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3453 {
16689 04e110438873 Expose builtin meta.* classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 16684 diff changeset	3454 // FIXME: Do we really want to unregister the package, as it
04e110438873 Expose builtin meta.* classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 16684 diff changeset	3455 // could still be referenced by classes or sub-packages?
04e110438873 Expose builtin meta.* classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 16684 diff changeset	3456 // If the package object is recreated later on, it won't
04e110438873 Expose builtin meta.* classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 16684 diff changeset	3457 // match the one already referenced by those classes or
04e110438873 Expose builtin meta.* classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 16684 diff changeset	3458 // sub-packages.
04e110438873 Expose builtin meta.* classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 16684 diff changeset	3459
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3460 cdef_manager& cdm
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3461 = octave::__get_cdef_manager__ ("cdef_package::cdef_package_rep::meta_release");
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3462
24541 3d1b40992075 Don't unregister 'meta' package in meta_release (Bug #52111) Piotr Held <pjheld@gmail.com> parents: 24540 diff changeset	3463 // Don't delete the "meta" package.
3d1b40992075 Don't unregister 'meta' package in meta_release (Bug #52111) Piotr Held <pjheld@gmail.com> parents: 24540 diff changeset	3464 if (this != cdm.meta ().get_rep ())
3d1b40992075 Don't unregister 'meta' package in meta_release (Bug #52111) Piotr Held <pjheld@gmail.com> parents: 24540 diff changeset	3465 cdm.unregister_package (wrap ());
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3466 }
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3467
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3468 //----------------------------------------------------------------------------
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	3469
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24539 diff changeset	3470 cdef_manager::cdef_manager (octave::interpreter& interp)
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24539 diff changeset	3471 : m_interpreter (interp), m_all_classes (), m_all_packages (),
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24539 diff changeset	3472 m_meta_class (), m_meta_property (), m_meta_method (),
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24539 diff changeset	3473 m_meta_package (), m_meta ()
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3474 {
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24539 diff changeset	3475 octave::type_info& ti = m_interpreter.get_type_info ();
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24539 diff changeset	3476
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24539 diff changeset	3477 octave_classdef::register_type (ti);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3478
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3479 // bootstrap
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3480 cdef_class tmp_handle = make_class ("handle");
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3481
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3482 m_meta_class = make_meta_class ("meta.class", tmp_handle);
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3483
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3484 tmp_handle.set_class (m_meta_class);
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3485 m_meta_class.set_class (m_meta_class);
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	3486
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3487 // meta classes
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3488 m_meta_property = make_meta_class ("meta.property", tmp_handle);
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3489
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3490 m_meta_method = make_meta_class ("meta.method", tmp_handle);
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3491
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3492 m_meta_package = make_meta_class ("meta.package", tmp_handle);
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3493
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3494 cdef_class tmp_meta_event
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3495 = make_meta_class ("meta.event", tmp_handle);
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3496
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3497 cdef_class tmp_meta_dynproperty
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3498 = make_meta_class ("meta.dynamicproperty", tmp_handle);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3499
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3500 // meta.class properties
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3501 m_meta_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3502 (make_attribute (m_meta_class, "Abstract"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3503
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3504 m_meta_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3505 (make_attribute (m_meta_class, "ConstructOnLoad"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3506
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3507 m_meta_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3508 (make_property (m_meta_class, "ContainingPackage"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3509
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3510 m_meta_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3511 (make_property (m_meta_class, "Description"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3512
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3513 m_meta_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3514 (make_property (m_meta_class, "DetailedDescription"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3515
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3516 m_meta_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3517 (make_property (m_meta_class, "Events"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3518
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3519 m_meta_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3520 (make_attribute (m_meta_class, "HandleCompatible"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3521
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3522 m_meta_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3523 (make_attribute (m_meta_class, "Hidden"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3524
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3525 m_meta_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3526 (make_property (m_meta_class, "InferiorClasses",
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3527 make_fcn_handle (class_get_inferiorclasses,
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3528 "meta.class>get.InferiorClasses"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3529 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3530
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3531 m_meta_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3532 (make_property (m_meta_class, "Methods",
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3533 make_fcn_handle (class_get_methods,
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3534 "meta.class>get.Methods"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3535 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3536
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3537 m_meta_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3538 (make_property (m_meta_class, "MethodList",
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3539 make_fcn_handle (class_get_methods,
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3540 "meta.class>get.MethodList"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3541 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3542
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3543 m_meta_class.install_property (make_attribute (m_meta_class, "Name"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3544
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3545 m_meta_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3546 (make_property (m_meta_class, "Properties",
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3547 make_fcn_handle (class_get_properties,
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3548 "meta.class>get.Properties"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3549 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3550
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3551 m_meta_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3552 (make_property (m_meta_class, "PropertyList",
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3553 make_fcn_handle (class_get_properties,
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3554 "meta.class>get.PropertyList"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3555 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3556
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3557 m_meta_class.install_property (make_attribute (m_meta_class, "Sealed"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3558
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3559 m_meta_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3560 (make_property (m_meta_class, "SuperClasses",
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3561 make_fcn_handle (class_get_superclasses,
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3562 "meta.class>get.SuperClasses"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3563 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3564
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3565 m_meta_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3566 (make_property (m_meta_class, "SuperClassList",
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3567 make_fcn_handle (class_get_superclasses,
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3568 "meta.class>get.SuperClassList"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3569 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3570
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3571 // meta.class methods
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3572 m_meta_class.install_method
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3573 (make_method (m_meta_class, "fromName", class_fromName, "public", true));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3574
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3575 m_meta_class.install_method
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3576 (make_method (m_meta_class, "fevalStatic", class_fevalStatic, "public",
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3577 false));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3578
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3579 m_meta_class.install_method
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3580 (make_method (m_meta_class, "getConstant", class_getConstant, "public",
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3581 false));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3582
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3583 m_meta_class.install_method (make_method (m_meta_class, "eq", class_eq));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3584 m_meta_class.install_method (make_method (m_meta_class, "ne", class_ne));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3585 m_meta_class.install_method (make_method (m_meta_class, "lt", class_lt));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3586 m_meta_class.install_method (make_method (m_meta_class, "le", class_le));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3587 m_meta_class.install_method (make_method (m_meta_class, "gt", class_gt));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3588 m_meta_class.install_method (make_method (m_meta_class, "ge", class_ge));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3589
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3590 // meta.method properties
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3591 m_meta_method.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3592 (make_attribute (m_meta_method, "Abstract"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3593
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3594 m_meta_method.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3595 (make_attribute (m_meta_method, "Access"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3596
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3597 m_meta_method.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3598 (make_attribute (m_meta_method, "DefiningClass"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3599
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3600 m_meta_method.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3601 (make_attribute (m_meta_method, "Description"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3602
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3603 m_meta_method.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3604 (make_attribute (m_meta_method, "DetailedDescription"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3605
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3606 m_meta_method.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3607 (make_attribute (m_meta_method, "Hidden"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3608
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3609 m_meta_method.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3610 (make_attribute (m_meta_method, "Name"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3611
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3612 m_meta_method.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3613 (make_attribute (m_meta_method, "Sealed"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3614
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3615 m_meta_method.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3616 (make_attribute (m_meta_method, "Static"));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3617
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3618 // meta.property properties
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3619 m_meta_property.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3620 (make_attribute (m_meta_property, "Name"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3621
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3622 m_meta_property.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3623 (make_attribute (m_meta_property, "Description"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3624
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3625 m_meta_property.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3626 (make_attribute (m_meta_property, "DetailedDescription"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3627
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3628 m_meta_property.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3629 (make_attribute (m_meta_property, "Abstract"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3630
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3631 m_meta_property.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3632 (make_attribute (m_meta_property, "Constant"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3633
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3634 m_meta_property.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3635 (make_attribute (m_meta_property, "GetAccess"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3636
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3637 m_meta_property.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3638 (make_attribute (m_meta_property, "SetAccess"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3639
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3640 m_meta_property.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3641 (make_attribute (m_meta_property, "Dependent"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3642
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3643 m_meta_property.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3644 (make_attribute (m_meta_property, "Transient"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3645
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3646 m_meta_property.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3647 (make_attribute (m_meta_property, "Hidden"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3648
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3649 m_meta_property.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3650 (make_attribute (m_meta_property, "GetObservable"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3651
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3652 m_meta_property.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3653 (make_attribute (m_meta_property, "SetObservable"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3654
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3655 m_meta_property.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3656 (make_attribute (m_meta_property, "GetMethod"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3657
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3658 m_meta_property.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3659 (make_attribute (m_meta_property, "SetMethod"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3660
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3661 m_meta_property.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3662 (make_attribute (m_meta_property, "DefiningClass"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3663
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3664 m_meta_property.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3665 (make_property (m_meta_property, "DefaultValue",
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3666 make_fcn_handle (property_get_defaultvalue,
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3667 "meta.property>get.DefaultValue"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3668 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3669
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3670 m_meta_property.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3671 (make_attribute (m_meta_property, "HasDefault"));
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3672
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3673 // meta.property events
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3674 // FIXME: add events
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3675
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3676 // handle methods
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3677
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3678 tmp_handle.install_method
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3679 (make_method (tmp_handle, "delete", handle_delete));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3680
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3681 // meta.package properties
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3682
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3683 m_meta_package.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3684 (make_attribute (m_meta_package, "Name"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3685
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3686 m_meta_package.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3687 (make_property (m_meta_package, "ContainingPackage"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3688
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3689 m_meta_package.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3690 (make_property (m_meta_package, "ClassList",
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3691 make_fcn_handle (package_get_classes,
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3692 "meta.package>get.ClassList"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3693 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3694
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3695 m_meta_package.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3696 (make_property (m_meta_package, "Classes",
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3697 make_fcn_handle (package_get_classes,
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3698 "meta.package>get.Classes"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3699 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3700
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3701 m_meta_package.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3702 (make_property (m_meta_package, "FunctionList",
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3703 make_fcn_handle (package_get_functions,
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3704 "meta.package>get.FunctionList"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3705 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3706
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3707 m_meta_package.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3708 (make_property (m_meta_package, "Functions",
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3709 make_fcn_handle (package_get_functions,
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3710 "meta.package>get.Functions"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3711 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3712
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3713 m_meta_package.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3714 (make_property (m_meta_package, "PackageList",
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3715 make_fcn_handle (package_get_packages,
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3716 "meta.package>get.PackageList"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3717 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3718
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3719 m_meta_package.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3720 (make_property (m_meta_package, "Packages",
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3721 make_fcn_handle (package_get_packages,
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3722 "meta.package>get.Packages"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3723 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3724
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3725 m_meta_package.install_method
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3726 (make_method (m_meta_package, "fromName", package_fromName,
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3727 "public", true));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3728
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3729 m_meta_package.install_method
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3730 (make_method (m_meta_package, "getAllPackages", package_getAllPackages,
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3731 "public", true));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3732
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3733 // create "meta" package
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3734 cdef_package package_meta
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3735 = m_meta
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3736 = make_package ("meta");
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3737
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3738 package_meta.install_class (m_meta_class, "class");
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3739 package_meta.install_class (m_meta_property, "property");
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3740 package_meta.install_class (m_meta_method, "method");
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3741 package_meta.install_class (m_meta_package, "package");
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3742 package_meta.install_class (tmp_meta_event, "event");
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3743 package_meta.install_class (tmp_meta_dynproperty, "dynproperty");
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3744
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23683 diff changeset	3745 octave::symbol_table& symtab = m_interpreter.get_symbol_table ();
16689 04e110438873 Expose builtin meta.* classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 16684 diff changeset	3746
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3747 // install built-in classes into the symbol table
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3748 symtab.install_built_in_function
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3749 ("meta.class",
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3750 octave_value (m_meta_class.get_constructor_function ()));
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3751
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3752 symtab.install_built_in_function
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3753 ("meta.method",
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3754 octave_value (m_meta_method.get_constructor_function ()));
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3755
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3756 symtab.install_built_in_function
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3757 ("meta.property",
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3758 octave_value (m_meta_property.get_constructor_function ()));
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3759
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3760 symtab.install_built_in_function
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3761 ("meta.package",
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3762 octave_value (m_meta_package.get_constructor_function ()));
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3763
24542 d6f06eeb8917 Don't install meta.event and meta.dynproperty in the symbol table. Piotr Held <pjheld@gmail.com> parents: 24541 diff changeset	3764 // FIXME: meta.event and meta.dynproperty are not implemented
d6f06eeb8917 Don't install meta.event and meta.dynproperty in the symbol table. Piotr Held <pjheld@gmail.com> parents: 24541 diff changeset	3765 // and should not be installed into symbol table.
d6f06eeb8917 Don't install meta.event and meta.dynproperty in the symbol table. Piotr Held <pjheld@gmail.com> parents: 24541 diff changeset	3766
d6f06eeb8917 Don't install meta.event and meta.dynproperty in the symbol table. Piotr Held <pjheld@gmail.com> parents: 24541 diff changeset	3767 // symtab.install_built_in_function
d6f06eeb8917 Don't install meta.event and meta.dynproperty in the symbol table. Piotr Held <pjheld@gmail.com> parents: 24541 diff changeset	3768 // ("meta.event",
d6f06eeb8917 Don't install meta.event and meta.dynproperty in the symbol table. Piotr Held <pjheld@gmail.com> parents: 24541 diff changeset	3769 // octave_value (tmp_meta_event.get_constructor_function ()));
d6f06eeb8917 Don't install meta.event and meta.dynproperty in the symbol table. Piotr Held <pjheld@gmail.com> parents: 24541 diff changeset	3770
d6f06eeb8917 Don't install meta.event and meta.dynproperty in the symbol table. Piotr Held <pjheld@gmail.com> parents: 24541 diff changeset	3771 // symtab.install_built_in_function
d6f06eeb8917 Don't install meta.event and meta.dynproperty in the symbol table. Piotr Held <pjheld@gmail.com> parents: 24541 diff changeset	3772 // ("meta.dynproperty",
d6f06eeb8917 Don't install meta.event and meta.dynproperty in the symbol table. Piotr Held <pjheld@gmail.com> parents: 24541 diff changeset	3773 // octave_value (tmp_meta_dynproperty.get_constructor_function ()));
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3774 }
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3775
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3776 cdef_class
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3777 cdef_manager::find_class (const std::string& name, bool error_if_not_found,
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3778 bool load_if_not_found)
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3779 {
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25321 diff changeset	3780 auto it = m_all_classes.find (name);
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3781
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3782 if (it == m_all_classes.end ())
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3783 {
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3784 if (load_if_not_found)
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3785 {
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3786 octave_value ov_cls;
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3787
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3788 size_t pos = name.rfind ('.');
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3789
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3790 if (pos == std::string::npos)
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3791 {
26065 2eb71b83d3e2 partially refactor function lookup in symbol table John W. Eaton <jwe@octave.org> parents: 26041 diff changeset	3792 octave::symbol_scope curr_scope
2eb71b83d3e2 partially refactor function lookup in symbol table John W. Eaton <jwe@octave.org> parents: 26041 diff changeset	3793 = m_interpreter.get_current_scope ();
2eb71b83d3e2 partially refactor function lookup in symbol table John W. Eaton <jwe@octave.org> parents: 26041 diff changeset	3794
26119 1dd0e16b82e3 eliminate some unnecessary function arguments John W. Eaton <jwe@octave.org> parents: 26066 diff changeset	3795 ov_cls = curr_scope.find (name);
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3796 }
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3797 else
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3798 {
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3799 std::string pack_name = name.substr (0, pos);
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3800
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3801 cdef_package pack = find_package (pack_name, false, true);
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3802
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3803 if (pack.ok ())
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3804 ov_cls = pack.find (name.substr (pos+1));
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3805 }
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3806
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3807 if (ov_cls.is_defined ())
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3808 it = m_all_classes.find (name);
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3809 }
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3810 }
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3811
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3812 if (it == m_all_classes.end ())
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3813 {
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3814 if (error_if_not_found)
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	3815 error ("class not found: %s", name.c_str ());
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3816 }
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3817 else
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3818 {
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3819 cdef_class cls = it->second;
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3820
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3821 if (! cls.is_builtin ())
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3822 cls = lookup_class (cls);
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3823
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3824 if (cls.ok ())
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	3825 return cls;
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3826 else
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3827 m_all_classes.erase (it);
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3828 }
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3829
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3830 return cdef_class ();
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3831 }
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3832
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3833 octave_function *
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3834 cdef_manager::find_method_symbol (const std::string& method_name,
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3835 const std::string& class_name)
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3836 {
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23450 diff changeset	3837 octave_function *retval = nullptr;
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3838
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3839 cdef_class cls = find_class (class_name, false, false);
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3840
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3841 if (cls.ok ())
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3842 {
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3843 cdef_method meth = cls.find_method (method_name);
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3844
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3845 if (meth.ok ())
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3846 retval = new octave_classdef_meta (meth);
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3847 }
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3848
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3849 return retval;
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3850 }
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3851
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3852 cdef_package
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3853 cdef_manager::find_package (const std::string& name, bool error_if_not_found,
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3854 bool load_if_not_found)
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3855 {
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3856 cdef_package retval;
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3857
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3858 std::map<std::string, cdef_package>::const_iterator it
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3859 = m_all_packages.find (name);
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3860
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3861 if (it != m_all_packages.end ())
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3862 {
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3863 retval = it->second;
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3864
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3865 if (! retval.ok ())
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3866 error ("invalid package `%s'", name.c_str ());
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3867 }
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3868 else
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3869 {
25360 bc5f225bc578 eliminate some global accesses to the breakpoint table John W. Eaton <jwe@octave.org> parents: 25342 diff changeset	3870 octave::load_path& lp = m_interpreter.get_load_path ();
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	3871
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	3872 if (load_if_not_found && lp.find_package (name))
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3873 {
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3874 size_t pos = name.find ('.');
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3875
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3876 if (pos == std::string::npos)
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20979 diff changeset	3877 retval = make_package (name, "");
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3878 else
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3879 {
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3880 std::string parent_name = name.substr (0, pos);
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3881
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3882 retval = make_package (name, parent_name);
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3883 }
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3884 }
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3885 else if (error_if_not_found)
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3886 error ("unknown package `%s'", name.c_str ());
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3887 }
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3888
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3889 return retval;
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3890 }
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3891
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3892 octave_function *
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3893 cdef_manager::find_package_symbol (const std::string& pack_name)
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3894 {
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23450 diff changeset	3895 octave_function *retval = nullptr;
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3896
20052 8b501a0db1e9 only insert package names into loader map if package dir exists (bug #43769) John W. Eaton <jwe@octave.org> parents: 19864 diff changeset	3897 cdef_package pack = find_package (pack_name, false);
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3898
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3899 if (pack.ok ())
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3900 retval = new octave_classdef_meta (pack);
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3901
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3902 return retval;
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3903 }
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3904
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3905 //----------------------------------------------------------------------------
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3906
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	3907 DEFUN (__meta_get_package__, args, ,
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	3908 doc: /* -- texinfo --
22299 9fc91bb2aec3 doc: grammarcheck documentation for 4.2 release. Rik <rik@octave.org> parents: 22297 diff changeset	3909 @deftypefn {} {} __meta_get_package__ ()
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	3910 Undocumented internal function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	3911 @end deftypefn */)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3912 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20743 diff changeset	3913 if (args.length () != 1)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3914 print_usage ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3915
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20743 diff changeset	3916 std::string cname = args(0).xstring_value ("PACKAGE_NAME must be a string");
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20743 diff changeset	3917
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20743 diff changeset	3918 return to_ov (lookup_package (cname));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3919 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3920
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3921 DEFUN (__superclass_reference__, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	3922 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	3923 @deftypefn {} {} __superclass_reference__ ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	3924 Undocumented internal function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	3925 @end deftypefn */)
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	3926 {
21127 df7891224709 maint: Use "return ovl (...)" in DEFUN macros. Rik <rik@octave.org> parents: 21121 diff changeset	3927 return ovl (new octave_classdef_superclass_ref (args));
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	3928 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	3929
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3930 DEFUN (__meta_class_query__, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	3931 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	3932 @deftypefn {} {} __meta_class_query__ ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	3933 Undocumented internal function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	3934 @end deftypefn */)
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	3935 {
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	3936 #if DEBUG_TRACE
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	3937 std::cerr << "__meta_class_query__ ("
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23693 diff changeset	3938 << args(0).string_value () << ')'
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	3939 << std::endl;
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	3940 #endif
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	3941
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20743 diff changeset	3942 if (args.length () != 1)
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	3943 print_usage ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	3944
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20743 diff changeset	3945 std::string cls = args(0).xstring_value ("CLASS_NAME must be a string");
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20743 diff changeset	3946
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20743 diff changeset	3947 return to_ov (lookup_class (cls));
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	3948 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	3949
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3950 DEFUN (metaclass, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	3951 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	3952 @deftypefn {} {} metaclass (obj)
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	3953 Returns the meta.class object corresponding to the class of @var{obj}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	3954 @end deftypefn */)
15897 a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	3955 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20743 diff changeset	3956 if (args.length () != 1)
15897 a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	3957 print_usage ();
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	3958
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20743 diff changeset	3959 cdef_object obj = to_cdef (args(0));
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20743 diff changeset	3960
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20743 diff changeset	3961 return to_ov (obj.get_class ());
15897 a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	3962 }
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	3963
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3964 /*
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3965 ;;; Local Variables: ***
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3966 ;;; mode: C++ ***
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3967 ;;; End: ***
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3968 */

Mercurial > octave

annotate libinterp/octave-value/ov-classdef.cc @ 26449:f8107140087c stable