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

annotate libinterp/octave-value/ov-classdef.cc @ 25367:0548e32e6b27 stable

call delete method correctly for handle class objects (bug #53844) * ov-classdef.h, ov-classdef.cc (cdef_object_rep::release): Accept reference to the to-be-deleted cdef_object. Change all callers. Call cdef_class::delete_object here. Pass referent to object to delete_object. (handle_cdef_object::~handle_cdef_object): Don't call delete_object. (cdef_class::cdef_class_rep::delete_object): Pass argument by const reference, not value. Simplify calling of delete method. Don't call delete_object on "handle" superclass object. (cdef_class_rep::delete_object): Pass argument by const reference.

author	John W. Eaton <jwe@octave.org>
date	Fri, 11 May 2018 16:22:03 -0400
parents	56201aad3462
children	b75d55b3dbb7

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
25054 6652d3823428 maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 24804 diff changeset	3 Copyright (C) 2012-2018 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 }
23576 00e518162fda maint: Deprecate is_cell and replace with iscell. Rik <rik@octave.org> parents: 23553 diff changeset	367 else if (acc.iscell ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	368 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	369 Cell acc_c = acc.cell_value ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	370
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	371 cdef_class ctx = get_class_context ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	372
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	373 // 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	374
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	375 if (ctx.ok ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	376 {
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	377 if (ctx == cls)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	378 return true;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	379
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	380 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	381 {
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	382 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	383
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	384 if (is_superclass (acc_cls, ctx))
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	385 return true;
15869 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 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	388 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	389 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	390 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	391 cls.get_name ().c_str ());
19597 db92e7e28e1f strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19343 diff changeset	392
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	393 return false;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	394 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	395
18263 b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	396 static bool
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	397 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	398 {
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	399 bool retval = false;
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	400
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	401 if (fcn.is_defined ())
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	402 {
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	403 if (fcn.is_user_function ())
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	404 {
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	405 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	406
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	407 if (! uf \|\| ! uf->body ())
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	408 retval = true;
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	409 }
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	410 }
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	411 else
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	412 retval = true;
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	413
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	414 return retval;
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	415 }
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	416
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	417 static bool
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	418 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	419 {
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23503 diff changeset	420 octave::tree_evaluator& tw
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23503 diff changeset	421 = octave::__get_evaluator__ ("is_method_executing");
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	422
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23534 diff changeset	423 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	424
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23534 diff changeset	425 octave_function *stack_fcn = cs.current ();
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23445 diff changeset	426
c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23445 diff changeset	427 octave_function *method_fcn = ov.function_value (true);
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	428
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	429 // 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	430
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	431 if (stack_fcn && stack_fcn == method_fcn)
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	432 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23445 diff changeset	433 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	434
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	435 // 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	436 // 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	437 // 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	438 // methods.
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	439
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	440 if (uf)
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	441 {
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	442 // 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	443 // 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	444 // 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	445 // is the first return value.
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	446
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23445 diff changeset	447 octave::tree_parameter_list *pl = uf->is_classdef_constructor ()
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	448 ? uf->return_list () : uf->parameter_list ();
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	449
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	450 if (pl && pl->size () > 0)
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	451 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	452 octave::tree_decl_elt *elt = pl->front ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	453
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23503 diff changeset	454 octave_value arg0 = tw.evaluate (elt);
16698 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 (arg0.is_defined () && arg0.type_name () == "object")
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 cdef_object arg0_obj = to_cdef (arg0);
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	459
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	460 return obj.is (arg0_obj);
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	461 }
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	462 }
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	463 }
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	464 }
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 return false;
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	467 }
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	468
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	469 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	470 class_get_methods (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	471 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	472 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	473
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	474 if (args.length () == 1 && args(0).type_name () == "object")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	475 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	476 cdef_class cls (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	477
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	478 retval(0) = cls.get_methods ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	479 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	480
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	481 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	482 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	483
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	484 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	485 class_get_superclasses (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	486 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	487 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	488
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	489 if (args.length () == 1 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	490 && args(0).class_name () == "meta.class")
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 Cell classes = cls.get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	495
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	496 retval(0) = to_ov (lookup_classes (classes));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	497 }
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 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	500 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	501
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	502 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	503 class_get_inferiorclasses (const octave_value_list& args, int /* nargout */)
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 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	506
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	507 if (args.length () == 1 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	508 && args(0).class_name () == "meta.class")
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 cdef_class cls (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	511
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	512 Cell classes = cls.get ("InferiorClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	513
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	514 retval(0) = to_ov (lookup_classes (classes));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	515 }
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 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	518 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	519
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	520 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	521 class_fromName (const octave_value_list& args, int /* nargout */)
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 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	524
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	525 if (args.length () != 1)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	526 error ("fromName: invalid number of parameters");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	527
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	528 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	529
24100 4d9ceaf17dda return empty matrix if meta..fromName fails (bug #52096) Piotr Held <pjheld@gmail.com>* parents: 23865 diff changeset	530 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	531
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	532 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	533 }
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 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	536 class_fevalStatic (const octave_value_list& args, int nargout)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	537 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	538 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	539 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	540
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	541 cdef_class cls (to_cdef (args(0)));
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	542
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	543 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	544
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	545 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	546
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	547 if (! meth.ok ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	548 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	549
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	550 if (! meth.is_static ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	551 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	552
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	553 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	554 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	555
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	556 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	557 class_getConstant (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	558 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	559 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	560
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	561 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	562 \|\| args(0).class_name () != "meta.class")
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	563 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	564
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	565 cdef_class cls = to_cdef (args(0));
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	566
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	567 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	568
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	569 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	570
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	571 if (! prop.ok ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	572 error ("getConstant: property not found: %s",
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	573 prop_name.c_str ());
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	574
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	575 if (! prop.is_constant ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	576 error ("getConstant: property `%s' is not constant",
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	577 prop_name.c_str ());
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	578
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	579 retval(0) = prop.get_value (true, "getConstant");
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	580
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	581 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	582 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	583
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	584 #define META_CLASS_CMP(OP, CLSA, CLSB, FUN) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	585 static octave_value_list \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	586 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	587 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	588 octave_value_list retval; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	589 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	590 if (args.length () != 2 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	591 \|\| args(0).type_name () != "object" \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	592 \|\| args(1).type_name () != "object" \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	593 \|\| args(0).class_name () != "meta.class" \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	594 \|\| args(1).class_name () != "meta.class") \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	595 error (#OP ": invalid arguments"); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	596 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	597 cdef_class clsa = to_cdef (args(0)); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	598 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	599 cdef_class clsb = to_cdef (args(1)); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	600 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	601 retval(0) = FUN (CLSA, CLSB); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	602 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	603 return retval; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22182 diff changeset	604 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	605
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	606 META_CLASS_CMP (lt, clsb, clsa, is_strict_superclass)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	607 META_CLASS_CMP (le, clsb, clsa, is_superclass)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	608 META_CLASS_CMP (gt, clsa, clsb, is_strict_superclass)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	609 META_CLASS_CMP (ge, clsa, clsb, is_superclass)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	610 META_CLASS_CMP (eq, clsa, clsb, operator==)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	611 META_CLASS_CMP (ne, clsa, clsb, operator!=)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	612
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	613 octave_value_list
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	614 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	615 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	616 octave_value_list retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	617
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	618 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	619 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	620 cdef_property prop (to_cdef (args(0)));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	621
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	622 retval(0) = prop.get ("DefaultValue");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	623
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	624 if (! retval(0).is_defined ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	625 error_with_id ("Octave:class:NotDefaultDefined",
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	626 "no default value for property `%s'",
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	627 prop.get_name ().c_str ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	628 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	629
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	630 return retval;
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
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	633 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	634 handle_delete (const octave_value_list& /* args /, int / nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	635 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	636 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	637
25367 0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	638 // 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	639
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	640 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	641 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	642
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	643 cdef_class
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	644 cdef_manager::make_class (const std::string& name,
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	645 const std::list<cdef_class>& super_list)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	646 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	647 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	648
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	649 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	650
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	651 cls.put ("Abstract", false);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	652 cls.put ("ConstructOnLoad", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	653 cls.put ("ContainingPackage", Matrix ());
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20979 diff changeset	654 cls.put ("Description", "");
93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20979 diff changeset	655 cls.put ("DetailedDescription", "");
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	656 cls.put ("Events", Cell ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	657 cls.put ("Hidden", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	658 cls.put ("InferiorClasses", Cell ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	659 cls.put ("Methods", Cell ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	660 cls.put ("Properties", Cell ());
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	661 cls.put ("Sealed", false);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	662
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	663 if (name == "handle")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	664 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	665 cls.put ("HandleCompatible", true);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	666 cls.mark_as_handle_class ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	667 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	668 else if (super_list.empty ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	669 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	670 cls.put ("HandleCompatible", false);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	671 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	672 else
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	673 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	674 bool all_handle_compatible = true;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	675 bool has_handle_class = false;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	676
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	677 for (const auto& cl : super_list)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	678 {
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	679 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	680 && 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	681 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	682 }
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 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	685 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	686 name.c_str ());
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	687
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	688 cls.put ("HandleCompatible", all_handle_compatible);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	689 if (has_handle_class)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	690 cls.mark_as_handle_class ();
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	691 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	692
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	693 if (! name.empty ())
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	694 register_class (cls);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	695
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	696 return cls;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	697 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	698
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	699 cdef_class
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	700 cdef_manager::make_class (const std::string& name,
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	701 const cdef_class& super)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	702 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	703 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	704 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	705
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	706 cdef_class
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	707 cdef_manager::make_meta_class (const std::string& name,
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	708 const cdef_class& super)
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	709 {
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	710 cdef_class cls = make_class (name, super);
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	711
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	712 cls.put ("Sealed", true);
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	713 cls.mark_as_meta_class ();
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	714
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	715 return cls;
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	716 }
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	717
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	718 cdef_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	719 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	720 const octave_value& get_method,
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	721 const std::string& get_access,
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	722 const octave_value& set_method,
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	723 const std::string& set_access)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	724 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	725 cdef_property prop (name);
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	726
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	727 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	728
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20979 diff changeset	729 prop.put ("Description", "");
93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20979 diff changeset	730 prop.put ("DetailedDescription", "");
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	731 prop.put ("Abstract", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	732 prop.put ("Constant", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	733 prop.put ("GetAccess", get_access);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	734 prop.put ("SetAccess", set_access);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	735 prop.put ("Dependent", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	736 prop.put ("Transient", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	737 prop.put ("Hidden", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	738 prop.put ("GetObservable", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	739 prop.put ("SetObservable", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	740 prop.put ("GetMethod", get_method);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	741 prop.put ("SetMethod", set_method);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	742 prop.put ("DefiningClass", to_ov (cls));
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	743 prop.put ("DefaultValue", octave_value ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	744 prop.put ("HasDefault", false);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	745
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	746 std::string class_name = cls.get_name ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	747
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23576 diff changeset	748 if (! get_method.isempty ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	749 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	750 if (! set_method.isempty ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	751 make_function_of_class (class_name, set_method);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	752
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	753 return prop;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	754 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	755
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	756 cdef_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	757 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	758 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	759 return make_property (cls, name, Matrix (), "public", Matrix (), "private");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	760 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	761
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	762 cdef_method
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	763 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	764 const octave_value& fcn,
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	765 const std::string& m_access, bool is_static)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	766 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	767 cdef_method meth (name);
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	768
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	769 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	770
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	771 meth.put ("Abstract", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	772 meth.put ("Access", m_access);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	773 meth.put ("DefiningClass", to_ov (cls));
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20979 diff changeset	774 meth.put ("Description", "");
93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20979 diff changeset	775 meth.put ("DetailedDescription", "");
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	776 meth.put ("Hidden", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	777 meth.put ("Sealed", true);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	778 meth.put ("Static", is_static);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	779
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	780 if (fcn.is_defined ())
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	781 make_function_of_class (cls, fcn);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	782
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	783 meth.set_function (fcn);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	784
18263 b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	785 if (is_dummy_method (fcn))
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	786 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	787
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	788 return meth;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	789 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	790
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	791 cdef_method
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	792 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	793 octave_builtin::fcn ff,
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	794 const std::string& m_access, bool is_static)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	795 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	796 octave_value fcn (new octave_builtin (ff, name));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	797
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	798 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	799 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	800
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	801 cdef_method
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	802 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	803 octave_builtin::meth mm,
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	804 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	805 {
8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	806 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	807
8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	808 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	809 }
8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	810
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	811 cdef_package
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	812 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	813 {
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	814 cdef_package pack (nm);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	815
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	816 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	817
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	818 if (parent.empty ())
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	819 pack.put ("ContainingPackage", Matrix ());
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	820 else
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	821 pack.put ("ContainingPackage", to_ov (find_package (parent)));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	822
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	823 if (! nm.empty ())
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	824 register_package (pack);
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	825
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	826 return pack;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	827 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	828
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	829 //----------------------------------------------------------------------------
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	830
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	831 int octave_classdef::t_id (-1);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	832
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	833 const std::string octave_classdef::t_name ("object");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	834
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	835 void
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24539 diff changeset	836 octave_classdef::register_type (octave::type_info& ti)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	837 {
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24539 diff changeset	838 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	839 octave_value (new octave_classdef ()));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	840 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	841
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	842 octave_value_list
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	843 octave_classdef::subsref (const std::string& type,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	844 const std::list<octave_value_list>& idx,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	845 int nargout)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	846 {
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	847 size_t skip = 0;
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	848 octave_value_list retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	849
18314 06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	850 cdef_class cls = object.get_class ();
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	851
18316 ff311e5ff6d8 Don't call classdef-overloaded subsref from builtin calls. Michael Goffioul <michael.goffioul@gmail.com> parents: 18314 diff changeset	852 if (! in_class_method (cls) && ! called_from_builtin ())
18314 06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	853 {
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	854 cdef_method meth = cls.find_method ("subsref");
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	855
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	856 if (meth.ok ())
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	857 {
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	858 octave_value_list args;
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	859
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	860 args(1) = make_idx_args (type, idx, "subsref");
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	861
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	862 count++;
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	863 args(0) = octave_value (this);
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	864
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	865 retval = meth.execute (args, nargout, true, "subsref");
18314 06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	866
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	867 return retval;
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	868 }
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
06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	871 // 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	872
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	873 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	874
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	875 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	876 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	877
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	878 return retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	879 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	880
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	881 octave_value
16696 665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	882 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	883 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	884 bool auto_add)
665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	885 {
665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	886 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	887 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	888
18314 06eb893b9db6 Implement subsref overloading in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 18305 diff changeset	889 // 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	890 // 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	891 // 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	892 // 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	893
665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	894 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	895
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	896 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	897 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	898
665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	899 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	900 }
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 octave_value
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	903 octave_classdef::subsasgn (const std::string& type,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	904 const std::list<octave_value_list>& idx,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	905 const octave_value& rhs)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	906 {
18382 6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	907 octave_value retval;
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	908
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	909 cdef_class cls = object.get_class ();
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	910
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	911 if (! in_class_method (cls) && ! called_from_builtin ())
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	912 {
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	913 cdef_method meth = cls.find_method ("subsasgn");
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	914
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	915 if (meth.ok ())
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	916 {
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	917 octave_value_list args;
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	918
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	919 args(1) = make_idx_args (type, idx, "subsasgn");
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	920
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	921 count++;
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	922 args(0) = octave_value (this);
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	923 args(2) = rhs;
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	924
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	925 octave_value_list retlist;
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	926
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	927 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	928
21885 0806871e3e1e maint: Prefer is_empty() rather than "length () == 0". Rik <rik@octave.org> parents: 21751 diff changeset	929 if (retlist.empty ())
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	930 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	931
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	932 retval = retlist(0);
18382 6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	933 }
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
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	936 if (! retval.is_defined ())
18382 6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	937 retval = object.subsasgn (type, idx, rhs);
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	938
6e3344111522 Implement subsasgn overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18355 diff changeset	939 return retval;
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	940 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	941
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	942 octave_value
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	943 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	944 const std::list<octave_value_list>& idx,
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	945 const octave_value& rhs)
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	946 {
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	947 if (type.length () == 1 && type[0] == '(')
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	948 {
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	949 object = object.make_array ();
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	950
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	951 return subsasgn (type, idx, rhs);
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	952 }
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	953 else
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	954 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	955
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	956 return octave_value ();
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	957 }
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	958
24802 7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	959 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	960 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	961 {
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	962 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	963
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	964 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	965
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	966 if (! in_class_method (cls) && ! called_from_builtin ())
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	967 {
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	968 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	969
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	970 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	971 {
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	972 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	973
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	974 count++;
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	975 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	976
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	977 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	978 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	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 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	981 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	982 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	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 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	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 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	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 }
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 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	991
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	992 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	993 }
7605e06a50d5 tie octave_classdef::numel method to "numel" user override method (bug #46571) Sébastien Villemot <sebastien@debian.org> parents: 23219 diff changeset	994
18416 bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	995 void
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	996 octave_classdef::print (std::ostream& os, bool)
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	997 {
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	998 print_raw (os);
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	999 }
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1000
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1001 void
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1002 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	1003 {
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1004 indent (os);
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1005 os << "<object ";
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1006 if (object.is_array ())
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1007 os << "array ";
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23693 diff changeset	1008 os << class_name () << '>';
18416 bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1009 newline (os);
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1010 }
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1011
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1012 bool
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1013 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	1014 const std::string& name) const
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 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	1017 }
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1018
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1019 void
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1020 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	1021 bool print_padding)
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1022 {
22898 9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22871 diff changeset	1023 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	1024 }
bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18397 diff changeset	1025
19103 56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19031 diff changeset	1026 bool
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19031 diff changeset	1027 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	1028 {
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19031 diff changeset	1029 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	1030
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19031 diff changeset	1031 if (cls.ok ())
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19031 diff changeset	1032 return is_superclass (cls, object.get_class ());
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19031 diff changeset	1033
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19031 diff changeset	1034 return false;
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19031 diff changeset	1035 }
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19031 diff changeset	1036
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1037 //----------------------------------------------------------------------------
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1038
15986 14aa0b5a980c Abstract the meta-protocol layer to use it for other meta objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 15968 diff changeset	1039 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	1040 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1041 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	1042 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	1043 : 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	1044
14aa0b5a980c Abstract the meta-protocol layer to use it for other meta objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 15968 diff changeset	1045 ~octave_classdef_meta (void)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1046 { object.meta_release (); }
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1047
23683 ffd27f53fc79 make +package function calls work again (bug #51295, #51296) John W. Eaton <jwe@octave.org> parents: 23666 diff changeset	1048 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	1049
23838 6e0fd7e3c262 Fix argument lookup in '+' package functions (Bug #51532). Piotr Held <pjheld@gmail.com> parents: 23829 diff changeset	1050 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	1051
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23445 diff changeset	1052 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	1053
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1054 octave_value_list
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1055 subsref (const std::string& type,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1056 const std::list<octave_value_list>& idx,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1057 int nargout)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1058 {
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23503 diff changeset	1059 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	1060 }
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1061
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23503 diff changeset	1062 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	1063 const octave_value_list& args)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1064 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1065 // Emulate ()-type meta subsref
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1066
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23503 diff changeset	1067 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	1068 std::string type ("(");
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1069
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23503 diff changeset	1070 return subsref (type, idx, nargout);
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1071 }
15955 837a4a9b5049 Support constructor call with no indexing syntax. Michael Goffioul <michael.goffioul@gmail.com> parents: 15913 diff changeset	1072
23503 6a2fed2d39ac improve some function names John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	1073 bool accepts_postfix_index (char type) const
6a2fed2d39ac improve some function names John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	1074 { 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	1075
18441 b0aba84cf80f Support handle to classdef constructor. Michael Goffioul <michael.goffioul@gmail.com> parents: 18439 diff changeset	1076 bool
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20979 diff changeset	1077 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	1078 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1079 bool retval = false;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1080
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1081 if (object.is_class ())
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1082 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1083 if (cname.empty ())
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1084 retval = true;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1085 else
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1086 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1087 cdef_class cls (object);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1088
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1089 if (cls.get_name () == cname)
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1090 retval = true;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1091 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1092 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1093
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1094 return retval;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1095 }
18441 b0aba84cf80f Support handle to classdef constructor. Michael Goffioul <michael.goffioul@gmail.com> parents: 18439 diff changeset	1096
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1097 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	1098 cdef_meta_object object;
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1099 };
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1100
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1101 //----------------------------------------------------------------------------
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1102
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1103 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	1104 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1105 public:
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1106 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	1107 : octave_function (), args (a) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1108
22868 87e3163f6c87 use c++11 "= default" syntax for declaration of trivial destructors John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1109 ~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	1110
24114 90932304969a maint: use correct const qualifier on overridden virtual function Mike Miller <mtmiller@octave.org> parents: 24100 diff changeset	1111 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	1112
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23445 diff changeset	1113 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	1114
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1115 octave_value_list
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23503 diff changeset	1116 call (octave::tree_evaluator&, 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	1117 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1118 octave_value_list retval;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1119
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1120 std::string meth_name;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1121 bool in_constructor;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1122 cdef_class ctx;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1123
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1124 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	1125
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1126 if (! ctx.ok ())
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1127 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	1128
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1129 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	1130 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	1131
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1132 cdef_class cls = lookup_class (cname);
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1133
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1134 if (in_constructor)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1135 {
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1136 if (! is_direct_superclass (cls, ctx))
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1137 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	1138 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	1139
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1140 if (! is_constructed_object (mname))
21055 5e00ed38a58b maint: Replace if/error/else paradigm with just if/error. Rik <rik@octave.org> parents: 21040 diff changeset	1141 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	1142 mname.c_str ());
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1143
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	1144 octave::symbol_scope scope
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1145 = octave::__require_current_scope__ ("octave_classdef_superclass_ref::call");
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1146
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	1147 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	1148
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1149 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	1150
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1151 retval(0) = sym;
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1152 }
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1153 else
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1154 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1155 if (mname != meth_name)
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1156 error ("method name mismatch (`%s' != `%s')",
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1157 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	1158
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1159 if (! is_strict_superclass (cls, ctx))
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1160 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	1161 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	1162
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1163 // I see 2 possible implementations here:
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1164 // 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	1165 // context; this avoids duplicating code, but
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1166 // 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	1167 // 2) lookup the method manually and call
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1168 // cdef_method::execute; this duplicates part of
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1169 // 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	1170 // assumption of 1)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1171 // 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	1172 // 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	1173
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1174 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	1175
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1176 if (! meth.ok ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1177 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	1178 meth_name.c_str (), cname.c_str ());
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1179
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1180 retval = meth.execute (idx, nargout, true,
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1181 meth_name);
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1182 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1183
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1184 return retval;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1185 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1186
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1187 private:
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1188 bool is_constructed_object (const std::string nm)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1189 {
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23534 diff changeset	1190 octave::call_stack& cs
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23534 diff changeset	1191 = octave::__get_call_stack__ ("octave_classdef_superclass_ref::is_constructed_object");
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23534 diff changeset	1192
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23534 diff changeset	1193 octave_function *of = cs.current ();
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1194
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1195 if (of->is_classdef_constructor ())
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1196 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1197 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	1198
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1199 if (uf)
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1200 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1201 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	1202
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1203 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	1204 return (ret_list->front ()->name () == nm);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1205 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1206 }
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 return false;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1209 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1210
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1211 private:
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1212 octave_value_list args;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1213 };
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1214
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1215 //----------------------------------------------------------------------------
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1216
25367 0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1217 void
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1218 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	1219 {
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1220 // 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	1221 // 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	1222 // 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	1223 // 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	1224 // 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	1225 // 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	1226
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1227 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	1228 {
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1229 --refcount;
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1230 return;
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1231 }
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1232
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1233 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	1234 {
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1235 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	1236
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1237 // Clear interrupts.
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1238 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	1239 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	1240
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1241 // Disallow quit().
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1242 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	1243 quit_allowed = false;
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 interpreter_try (frame);
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1246
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1247 try
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1248 {
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1249 // 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	1250 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	1251 }
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1252 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	1253 {
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1254 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	1255
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1256 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	1257 }
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1258 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	1259 {
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1260 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	1261 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	1262 msg.c_str ());
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1263
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1264 }
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1265 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	1266 {
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1267 // 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	1268 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	1269 }
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1270 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	1271 {
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1272 // 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	1273 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	1274 }
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1275 }
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 // 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	1278 refcount--;
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1279
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1280 destroy ();
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1281 }
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	1282
19184 e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1283 octave_map
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1284 cdef_object::map_value (void) const
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1285 {
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1286 octave_map retval;
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1287
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1288 warning_with_id ("Octave:classdef-to-struct",
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1289 "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	1290 "overrides the access restrictions defined for properties. "
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1291 "All properties are returned, including private and "
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1292 "protected ones.");
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1293
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1294 cdef_class cls = get_class ();
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1295
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1296 if (cls.ok ())
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1297 {
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1298 std::map<std::string, cdef_property> props;
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1299
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1300 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	1301
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	1302 // 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	1303 for (auto& prop_val : props)
19184 e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1304 {
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1305 if (is_array ())
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1306 {
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1307 Array<cdef_object> a_obj = array_value ();
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1308
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1309 Cell cvalue (a_obj.dims ());
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 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	1312 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	1313
50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	1314 retval.setfield (prop_val.first, cvalue);
19184 e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1315 }
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1316 else
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1317 {
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1318 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	1319 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	1320
50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	1321 retval.setfield (prop_val.first, cvalue);
19184 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 }
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
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1326 return retval;
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1327 }
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	1328
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1329 string_vector
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1330 cdef_object_rep::map_keys (void) const
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1331 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1332 cdef_class cls = get_class ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1333
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1334 if (cls.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1335 return cls.get_names ();
19597 db92e7e28e1f strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19343 diff changeset	1336
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1337 return string_vector ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1338 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1339
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1340 octave_value_list
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1341 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	1342 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	1343 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	1344 const cdef_class& context, bool auto_add)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1345 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1346 skip = 0;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1347
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1348 cdef_class cls = (context.ok () ? context : get_class ());
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1349
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1350 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1351
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1352 if (! cls.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1353 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1354
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1355 switch (type[0])
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 case '.':
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1358 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1359 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	1360
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1361 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	1362
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1363 if (meth.ok ())
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1364 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1365 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	1366
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1367 octave_value_list args;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1368
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1369 skip = 1;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1370
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1371 if (type.length () > 1 && type[1] == '(')
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1372 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1373 std::list<octave_value_list>::const_iterator it = idx.begin ();
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1374
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1375 args = *++it;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1376
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1377 skip++;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1378 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1379
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1380 if (meth.is_static ())
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1381 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	1382 else
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 refcount++;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1385 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	1386 true, "subsref");
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 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1389
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1390 if (skip == 0)
19861 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 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	1393
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1394 if (! prop.ok ())
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1395 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	1396
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1397 if (prop.is_constant ())
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1398 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	1399 else
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1400 {
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1401 refcount++;
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1402 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	1403 true, "subsref");
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1404 }
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1405
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1406 skip = 1;
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1407 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1408 break;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1409 }
16696 665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	1410
665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	1411 case '(':
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1412 {
20189 b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1413 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	1414
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1415 refcount++;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1416 cdef_object this_obj (this);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1417
20189 b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1418 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	1419 {
b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1420 skip++;
b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1421 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	1422 }
b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1423 else
b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1424 {
b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1425 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	1426
b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1427 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	1428
b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1429 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	1430
b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1431 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	1432 }
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1433 }
16696 665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	1434 break;
665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	1435
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1436 default:
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1437 error ("object cannot be indexed with `%c'", type[0]);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1438 break;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1439 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1440
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1441 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1442 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1443
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1444 octave_value
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1445 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	1446 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	1447 const octave_value& rhs)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1448 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1449 octave_value retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1450
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1451 cdef_class cls = get_class ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1452
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1453 switch (type[0])
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1454 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1455 case '.':
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1456 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1457 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	1458
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1459 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	1460
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1461 if (! prop.ok ())
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1462 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	1463
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1464 if (prop.is_constant ())
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1465 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	1466 name.c_str ());
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1467
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1468 refcount++;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1469
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1470 cdef_object obj (this);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1471
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1472 if (type.length () == 1)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1473 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1474 prop.set_value (obj, rhs, true, "subsasgn");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1475
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1476 retval = to_ov (obj);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1477 }
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	1478 else
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1479 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1480 octave_value val =
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1481 prop.get_value (obj, true, "subsasgn");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1482
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1483 std::list<octave_value_list> args (idx);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1484
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1485 args.erase (args.begin ());
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1486
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1487 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	1488 type.substr (1), args, rhs);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1489
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1490 if (val.class_name () != "object"
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1491 \|\| ! to_cdef (val).is_handle_object ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1492 prop.set_value (obj, val, true, "subsasgn");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1493
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1494 retval = to_ov (obj);
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1495 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1496 }
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1497 break;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1498
16694 50b37deadb66 Promote scalar object to array for '(' idnex assignment. Michael Goffioul <michael.goffioul@gmail.com> parents: 16692 diff changeset	1499 case '(':
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1500 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1501 refcount++;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1502
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1503 cdef_object this_obj (this);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1504
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1505 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	1506
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1507 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	1508
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1509 new_obj.set_class (get_class ());
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1510
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1511 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	1512
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1513 retval = tmp;
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1514 }
16694 50b37deadb66 Promote scalar object to array for '(' idnex assignment. Michael Goffioul <michael.goffioul@gmail.com> parents: 16692 diff changeset	1515 break;
50b37deadb66 Promote scalar object to array for '(' idnex assignment. Michael Goffioul <michael.goffioul@gmail.com> parents: 16692 diff changeset	1516
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1517 default:
16694 50b37deadb66 Promote scalar object to array for '(' idnex assignment. Michael Goffioul <michael.goffioul@gmail.com> parents: 16692 diff changeset	1518 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	1519 break;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1520 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1521
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1522 return retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1523 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1524
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1525 void
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1526 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	1527 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1528 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	1529
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1530 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	1531
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1532 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	1533
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1534 ctor_list[cls] = supcls_list;
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1535 }
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1536
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1537 octave_value_list
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1538 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	1539 const std::list<octave_value_list>& idx,
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1540 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	1541 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	1542 {
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1543 octave_value_list retval;
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1544
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1545 skip = 1;
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1546
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1547 switch (type[0])
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1548 {
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1549 case '(':
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1550 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1551 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	1552
20125 274b52724931 Stop segfault when using empty indexing of a classdef object. Rik <rik@octave.org> parents: 20052 diff changeset	1553 if (ival.empty ())
274b52724931 Stop segfault when using empty indexing of a classdef object. Rik <rik@octave.org> parents: 20052 diff changeset	1554 {
20189 b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1555 refcount++;
b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1556 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	1557 break;
274b52724931 Stop segfault when using empty indexing of a classdef object. Rik <rik@octave.org> parents: 20052 diff changeset	1558 }
274b52724931 Stop segfault when using empty indexing of a classdef object. Rik <rik@octave.org> parents: 20052 diff changeset	1559
20189 b2532deba721 Return copy of class object when using null indexing (bug #44940). John W. Eaton <jwe@octave.org> parents: 20125 diff changeset	1560 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	1561 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	1562
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1563 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	1564 {
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20488 diff changeset	1565 try
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20488 diff changeset	1566 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20488 diff changeset	1567 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	1568 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22324 diff changeset	1569 catch (octave::index_exception& e)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1570 {
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20488 diff changeset	1571 // 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	1572 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	1573 throw;
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1574 }
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1575
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1576 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	1577 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1578
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1579 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	1580
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1581 // 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	1582 // 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	1583 // invalid cdef_objects.
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1584
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1585 if (auto_add)
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1586 fill_empty_values (ires);
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1587
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1588 if (is_scalar)
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1589 retval(0) = to_ov (ires(0));
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1590 else
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1591 {
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1592 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	1593
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1594 array_obj.set_class (get_class ());
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1595
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1596 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	1597 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1598 }
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1599 break;
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1600
16692 b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1601 case '.':
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1602 if (type.size () == 1 && idx.size () == 1)
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1603 {
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1604 Cell c (dims ());
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1605
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1606 octave_idx_type n = array.numel ();
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1607
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1608 // dummy variables
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1609 size_t dummy_skip;
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1610 cdef_class dummy_cls;
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1611
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1612 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	1613 {
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1614 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	1615 dummy_cls);
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1616
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1617 if (r.length () > 0)
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1618 c(i) = r(0);
16692 b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1619 }
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1620
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1621 retval(0) = octave_value (c, true);
16692 b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1622
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1623 break;
b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1624 }
23826 d69021d58a61 avoid fallthrough warnings John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	1625 OCTAVE_FALLTHROUGH;
16692 b9833510355d Add object array property indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16691 diff changeset	1626
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1627 default:
20428 7ac907da9fba Use error() rather than ::error() unless explicitly required. Rik <rik@octave.org> parents: 20193 diff changeset	1628 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	1629 class_name ().c_str ());
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1630 break;
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1631 }
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1632
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1633 return retval;
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1634 }
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1635
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1636 octave_value
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1637 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	1638 const std::list<octave_value_list>& idx,
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1639 const octave_value& rhs)
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1640 {
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1641 octave_value retval;
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1642
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1643 switch (type[0])
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1644 {
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1645 case '(':
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1646 if (type.length () == 1)
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1647 {
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1648 cdef_object rhs_obj = to_cdef (rhs);
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1649
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1650 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	1651 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	1652 rhs_obj.class_name ().c_str (),
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1653 class_name ().c_str ());
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1654
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1655 const octave_value_list& ival = idx.front ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1656 bool is_scalar = true;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1657 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	1658
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1659 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	1660 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1661 try
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1662 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1663 iv(i) = ival(i).index_vector ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1664 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22324 diff changeset	1665 catch (octave::index_exception& e)
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1666 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1667 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	1668 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	1669 }
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1670
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1671 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	1672 }
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1673
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1674 Array<cdef_object> rhs_mat;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1675
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1676 if (! rhs_obj.is_array ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1677 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1678 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	1679 rhs_mat(0) = rhs_obj;
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1680 }
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1681 else
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1682 rhs_mat = rhs_obj.array_value ();
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 octave_idx_type n = array.numel ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1685
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1686 array.assign (iv, rhs_mat, cdef_object ());
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 if (array.numel () > n)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1689 fill_empty_values ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1690
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1691 refcount++;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1692 retval = to_ov (cdef_object (this));
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1693 }
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1694 else
16695 2823f8e3da77 Add multi-level index assignment for object array. Michael Goffioul <michael.goffioul@gmail.com> parents: 16694 diff changeset	1695 {
23345 0b6810085ed3 Altering class member of object array modifies other class members (bug #46660). Lachlan Andrew <lachlanbis@gmail.com> parents: 23220 diff changeset	1696 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	1697
0b6810085ed3 Altering class member of object array modifies other class members (bug #46660). Lachlan Andrew <lachlanbis@gmail.com> parents: 23220 diff changeset	1698 // 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	1699 // 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	1700 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	1701 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	1702 ? 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	1703 ? 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	1704 : ovl (ivl(0), one));
16695 2823f8e3da77 Add multi-level index assignment for object array. Michael Goffioul <michael.goffioul@gmail.com> parents: 16694 diff changeset	1705
2823f8e3da77 Add multi-level index assignment for object array. Michael Goffioul <michael.goffioul@gmail.com> parents: 16694 diff changeset	1706 bool is_scalar = true;
2823f8e3da77 Add multi-level index assignment for object array. Michael Goffioul <michael.goffioul@gmail.com> parents: 16694 diff changeset	1707
23345 0b6810085ed3 Altering class member of object array modifies other class members (bug #46660). Lachlan Andrew <lachlanbis@gmail.com> parents: 23220 diff changeset	1708 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	1709
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1710 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	1711 {
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20488 diff changeset	1712 try
16695 2823f8e3da77 Add multi-level index assignment for object array. Michael Goffioul <michael.goffioul@gmail.com> parents: 16694 diff changeset	1713 {
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20488 diff changeset	1714 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	1715 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22324 diff changeset	1716 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	1717 {
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20488 diff changeset	1718 // 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	1719 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	1720 throw;
16695 2823f8e3da77 Add multi-level index assignment for object array. Michael Goffioul <michael.goffioul@gmail.com> parents: 16694 diff changeset	1721 }
2823f8e3da77 Add multi-level index assignment for object array. Michael Goffioul <michael.goffioul@gmail.com> parents: 16694 diff changeset	1722
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1723 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	1724
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1725 if (! is_scalar)
21055 5e00ed38a58b maint: Replace if/error/else paradigm with just if/error. Rik <rik@octave.org> parents: 21040 diff changeset	1726 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	1727 ", 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	1728 "array.");
16695 2823f8e3da77 Add multi-level index assignment for object array. Michael Goffioul <michael.goffioul@gmail.com> parents: 16694 diff changeset	1729 }
2823f8e3da77 Add multi-level index assignment for object array. Michael Goffioul <michael.goffioul@gmail.com> parents: 16694 diff changeset	1730
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1731 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	1732
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1733 if (a.numel () != 1)
21055 5e00ed38a58b maint: Replace if/error/else paradigm with just if/error. Rik <rik@octave.org> parents: 21040 diff changeset	1734 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	1735
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1736 cdef_object obj = a(0);
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1737
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1738 int ignore_copies = 0;
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1739
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1740 // 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	1741 // 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	1742
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1743 if (! obj.ok ())
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1744 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	1745 else
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21724 diff changeset	1746 // 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	1747 // that we can safely ignore:
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1748 // - 1 in "array"
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1749 // - 1 in "a"
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1750 ignore_copies = 2;
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1751
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1752 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	1753
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1754 next_idx.erase (next_idx.begin ());
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1755
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1756 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	1757 rhs, ignore_copies);
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1758
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1759 cdef_object robj = to_cdef (tmp);
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1760
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1761 if (! robj.ok ()
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1762 \|\| robj.is_array ()
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1763 \|\| 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	1764 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	1765 class_name ().c_str ());
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1766
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1767 // Small optimization, when dealing with handle
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1768 // 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	1769 // of subsasgn back into the array.
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1770
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1771 if (! robj.is (a(0)))
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1772 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1773 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	1774 robj);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1775
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1776 octave_idx_type n = array.numel ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1777
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1778 array.assign (iv, rhs_a);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1779
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1780 if (array.numel () > n)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1781 fill_empty_values ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1782 }
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1783
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1784 refcount++;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1785
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1786 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	1787 }
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1788 break;
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1789
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1790 default:
20428 7ac907da9fba Use error() rather than ::error() unless explicitly required. Rik <rik@octave.org> parents: 20193 diff changeset	1791 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	1792 class_name ().c_str ());
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1793 break;
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1794 }
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1795
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1796 return retval;
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1797 }
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1798
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1799 void
16696 665fa0f621cc Support combination of object array extension and multi-level indexing. Michael Goffioul <michael.goffioul@gmail.com> parents: 16695 diff changeset	1800 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	1801 {
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1802 cdef_class cls = get_class ();
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1803
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1804 cdef_object obj;
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1805
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1806 int n = arr.numel ();
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1807
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1808 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	1809 {
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1810 if (! arr.xelem (i).ok ())
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1811 {
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1812 if (! obj.ok ())
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1813 {
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1814 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	1815
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1816 arr.xelem (i) = obj;
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1817 }
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1818 else
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1819 arr.xelem (i) = obj.copy ();
15913 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 }
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	1822 }
19597 db92e7e28e1f strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19343 diff changeset	1823
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1824 bool
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1825 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	1826 {
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1827 return (is_constructed ()
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1828 \|\| 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	1829 }
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1830
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1831 bool
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1832 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	1833 {
23534 b6498c088fca maint: Don't write '> >' for declaration of templates that use templates. Rik <rik@octave.org> parents: 23533 diff changeset	1834 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	1835
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1836 if (is_constructed ())
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1837 return true;
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1838 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	1839 \|\| it->second.empty ())
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1840 return true;
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1841
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	1842 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	1843 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	1844 return false;
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1845
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1846 return true;
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1847 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1848
20921 4d3daf7e43f3 eliminate trailing whitespace in source files John W. Eaton <jwe@octave.org> parents: 20912 diff changeset	1849 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	1850 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	1851 {
9851a296cf87 Fix compilation of classdef with the clang compiler (bug #41178) akira noda <you.akira.noda@gmail.com> parents: 20181 diff changeset	1852 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	1853 }
9851a296cf87 Fix compilation of classdef with the clang compiler (bug #41178) akira noda <you.akira.noda@gmail.com> parents: 20181 diff changeset	1854
15870 2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1855 handle_cdef_object::~handle_cdef_object (void)
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1856 {
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	1857 #if DEBUG_TRACE
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	1858 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	1859 << " object (handle)" << std::endl;
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	1860 #endif
15870 2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1861 }
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1862
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1863 value_cdef_object::~value_cdef_object (void)
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1864 {
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	1865 #if DEBUG_TRACE
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	1866 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	1867 << " object (value)" << std::endl;
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	1868 #endif
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1869 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1870
23533 8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	1871 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	1872 : 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	1873 object_count (0), meta (false)
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1874 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1875 put ("SuperClasses", to_ov (superclasses));
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1876 implicit_ctor_list = superclasses;
15870 2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1877 }
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1878
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1879 cdef_method
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1880 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	1881 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1882 method_iterator it = method_map.find (nm);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1883
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1884 if (it == method_map.end ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1885 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1886 // FIXME: look into class directory
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1887 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1888 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1889 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1890 cdef_method& meth = it->second;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1891
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1892 // FIXME: check if method reload needed
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1893
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1894 if (meth.ok ())
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	1895 return meth;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1896 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1897
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1898 if (! local)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1899 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1900 // Look into superclasses
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1901
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1902 Cell super_classes = get ("SuperClasses").cell_value ();
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1903
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1904 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	1905 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1906 cdef_class cls = lookup_class (super_classes(i));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1907
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1908 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	1909
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1910 if (meth.ok ())
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1911 return meth;
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1912 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1913 }
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 return cdef_method ();
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
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1918 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	1919 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1920 public:
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1921 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	1922 : 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	1923
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1924 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	1925 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	1926 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	1927 stmt_p->accept (*this);
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1928 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1929
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1930 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	1931 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1932 if (t.is_expression ())
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1933 t.expression ()->accept (*this);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1934 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1935
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1936 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	1937 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1938 t.right_hand_side ()->accept (*this);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1939 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1940
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1941 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	1942 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1943 t.right_hand_side ()->accept (*this);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1944 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1945
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1946 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	1947 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1948 t.expression ()->accept (*this);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1949 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1950
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1951 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	1952 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1953 octave_value fcn = t.function ();
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1954
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1955 if (fcn.is_function ())
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1956 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1957 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	1958
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1959 if (of)
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1960 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1961 if (of->name () == "__superclass_reference__")
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1962 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1963 octave_value_list args = t.arguments ();
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 (args(0).string_value () == obj_name)
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1966 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1967 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	1968
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1969 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	1970
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1971 if (cls.ok ())
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1972 ctor_list.push_back (cls);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1973 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1974 }
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 }
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
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1979 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	1980 { return ctor_list; }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1981
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1982 // NO-OP
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1983 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	1984 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	1985 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	1986 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	1987 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	1988 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	1989 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	1990 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	1991 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	1992 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	1993 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	1994 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	1995 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	1996 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	1997 void visit_identifier (octave::tree_identifier&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1998 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	1999 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	2000 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	2001 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	2002 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	2003 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	2004 void visit_matrix (octave::tree_matrix&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2005 void visit_cell (octave::tree_cell&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2006 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	2007 void visit_constant (octave::tree_constant&) { }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2008 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	2009 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	2010 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	2011 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	2012 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	2013 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	2014 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	2015 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	2016 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	2017 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	2018
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2019 private:
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	2020 // 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	2021 std::string who;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2022
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	2023 // 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	2024 std::string obj_name;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2025
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	2026 // 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	2027 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	2028 };
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2029
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2030 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2031 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	2032 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2033 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	2034
15911 b18b7e560236 More flexible refcount to account for owned back-references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15910 diff changeset	2035 member_count++;
b18b7e560236 More flexible refcount to account for owned back-references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15910 diff changeset	2036
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2037 if (meth.is_constructor ())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2038 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2039 // 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	2040 // constructors are called explicitly.
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2041
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2042 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	2043
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2044 if (of)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2045 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2046 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	2047
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2048 if (uf)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2049 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2050 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	2051 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	2052
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2053 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	2054 error ("%s: invalid constructor output arguments",
7ac907da9fba Use error() rather than ::error() unless explicitly required. Rik <rik@octave.org> parents: 20193 diff changeset	2055 meth.get_name ().c_str ());
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2056
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2057 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	2058 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	2059
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2060 body->accept (a);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2061
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2062 std::list<cdef_class> explicit_ctor_list
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2063 = a.get_constructor_list ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2064
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2065 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	2066 {
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2067 #if DEBUG_TRACE
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2068 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	2069 << 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	2070 #endif
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2071
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2072 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	2073 }
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 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2076 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2077 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2078
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2079 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2080 cdef_class::cdef_class_rep::load_all_methods (void)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2081 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2082 // FIXME: re-scan class directory
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2083 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2084
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2085 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2086 cdef_class::cdef_class_rep::get_methods (void)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2087 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2088 std::map<std::string,cdef_method> meths;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2089
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2090 find_methods (meths, false);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2091
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2092 Cell c (meths.size (), 1);
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2093
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2094 int idx = 0;
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2095
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2096 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	2097 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	2098
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2099 return c;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2100 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2101
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2102 void
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2103 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	2104 cdef_method>& meths,
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2105 bool only_inherited)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2106 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2107 load_all_methods ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2108
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2109 method_const_iterator it;
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 for (it = method_map.begin (); it != method_map.end (); ++it)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2112 {
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2113 if (! it->second.is_constructor ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2114 {
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2115 std::string nm = it->second.get_name ();
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2116
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2117 if (meths.find (nm) == meths.end ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2118 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2119 if (only_inherited)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2120 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2121 octave_value acc = it->second.get ("Access");
15036 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 if (! acc.is_string ()
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2124 \|\| acc.string_value () == "private")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2125 continue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2126 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2127
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2128 meths[nm] = it->second;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2129 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2130 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2131 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2132
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2133 // Look into superclasses
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 Cell super_classes = get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2136
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2137 for (int i = 0; i < super_classes.numel (); i++)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2138 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2139 cdef_class cls = lookup_class (super_classes(i));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2140
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2141 cls.get_rep ()->find_methods (meths, true);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2142 }
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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2145 cdef_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2146 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	2147 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2148 property_iterator it = property_map.find (nm);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2149
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2150 if (it != property_map.end ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2151 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2152 cdef_property& prop = it->second;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2153
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2154 if (prop.ok ())
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	2155 return prop;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2156 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2157
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2158 // Look into superclasses
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2159
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2160 Cell super_classes = get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2161
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2162 for (int i = 0; i < super_classes.numel (); i++)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2163 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2164 cdef_class cls = lookup_class (super_classes(i));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2165
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2166 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	2167
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2168 if (prop.ok ())
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2169 return prop;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2170 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2171
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2172 return cdef_property ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2173 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2174
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2175 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2176 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	2177 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2178 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	2179
b18b7e560236 More flexible refcount to account for owned back-references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15910 diff changeset	2180 member_count++;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2181 }
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 Cell
19184 e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	2184 cdef_class::cdef_class_rep::get_properties (int mode)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2185 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2186 std::map<std::string,cdef_property> props;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2187
19184 e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	2188 props = get_property_map (mode);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2189
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2190 Cell c (props.size (), 1);
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2191
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2192 int idx = 0;
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2193
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2194 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	2195 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	2196
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2197 return c;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2198 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2199
19184 e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	2200 std::map<std::string, cdef_property>
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	2201 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	2202 {
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	2203 std::map<std::string,cdef_property> props;
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	2204
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	2205 find_properties (props, mode);
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	2206
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	2207 return props;
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	2208 }
e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	2209
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2210 void
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2211 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	2212 cdef_property>& props,
19184 e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	2213 int mode)
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 property_const_iterator it;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2216
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2217 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	2218 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2219 std::string nm = it->second.get_name ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2220
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2221 if (props.find (nm) == props.end ())
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	2222 {
19184 e0a7718ac085 Implement calling "struct" on classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 19103 diff changeset	2223 if (mode == property_inherited)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2224 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2225 octave_value acc = it->second.get ("GetAccess");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2226
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2227 if (! acc.is_string ()
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2228 \|\| acc.string_value () == "private")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2229 continue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2230 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2231
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	2232 props[nm] = it->second;
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	2233 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2234 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2235
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2236 // Look into superclasses
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2237
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2238 Cell super_classes = get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2239
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2240 for (int i = 0; i < super_classes.numel (); i++)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2241 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2242 cdef_class cls = lookup_class (super_classes(i));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2243
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2244 cls.get_rep ()->find_properties (props,
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2245 (mode == property_all
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2246 ? property_all
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2247 : property_inherited));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2248 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2249 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2250
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2251 void
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2252 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	2253 bool all)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2254 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2255 load_all_methods ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2256
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2257 for (const auto& cls_fnmap : method_map)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2258 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2259 if (! cls_fnmap.second.is_constructor ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2260 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2261 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	2262
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2263 if (! all)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2264 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2265 octave_value acc = cls_fnmap.second.get ("Access");
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2266
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2267 if (! acc.is_string()
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2268 \|\| acc.string_value () != "public")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2269 continue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2270 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2271
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2272 names.insert (nm);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2273 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2274 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2275
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2276 for (const auto& pname_prop : property_map)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2277 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2278 std::string nm = pname_prop.second.get_name ();
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2279
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2280 if (! all)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2281 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2282 octave_value acc = pname_prop.second.get ("GetAccess");
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2283
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2284 if (! acc.is_string()
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2285 \|\| acc.string_value () != "public")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2286 continue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2287 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2288
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2289 names.insert (nm);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2290 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2291
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2292 // Look into superclasses
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2293
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2294 Cell super_classes = get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2295
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2296 for (int i = 0; i < super_classes.numel (); i++)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2297 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2298 cdef_class cls = lookup_class (super_classes(i));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2299
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2300 cls.get_rep ()->find_names (names, all);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2301 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2302 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2303
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2304 string_vector
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2305 cdef_class::cdef_class_rep::get_names (void)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2306 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2307 std::set<std::string> names;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2308
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2309 find_names (names, false);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2310
22374 f38e81248556 ov-classdef.cc: use string_vector constructor for string containers. Carnë Draug <carandraug@octave.org> parents: 22327 diff changeset	2311 string_vector v (names);
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2312
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2313 return v.sort (true);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2314 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2315
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2316 void
25367 0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	2317 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	2318 {
25367 0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	2319 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	2320
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	2321 if (dtor.ok ())
0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	2322 dtor.execute (obj, octave_value_list (), 0, true, "destructor");
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 // FIXME: should we destroy corresponding properties here?
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2325
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2326 // Call "delete" in super classes
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2327
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2328 Cell super_classes = get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2329
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2330 for (int i = 0; i < super_classes.numel (); i++)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2331 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2332 cdef_class cls = lookup_class (super_classes(i));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2333
25367 0548e32e6b27 call delete method correctly for handle class objects (bug #53844) John W. Eaton <jwe@octave.org> parents: 25319 diff changeset	2334 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	2335 cls.delete_object (obj);
15036 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 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2338
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2339 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	2340 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	2341 const std::list<octave_value_list>& idx,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2342 int nargout)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2343 {
15956 d8553705f8f0 Support calling static methods and getting constant properties. Michael Goffioul <michael.goffioul@gmail.com> parents: 15955 diff changeset	2344 size_t skip = 1;
d8553705f8f0 Support calling static methods and getting constant properties. Michael Goffioul <michael.goffioul@gmail.com> parents: 15955 diff changeset	2345
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2346 octave_value_list retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2347
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2348 switch (type[0])
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2349 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2350 case '(':
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2351 // Constructor call
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2352
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2353 #if DEBUG_TRACE
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2354 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	2355 #endif
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2356
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2357 retval(0) = construct (idx.front ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2358 break;
15956 d8553705f8f0 Support calling static methods and getting constant properties. Michael Goffioul <michael.goffioul@gmail.com> parents: 15955 diff changeset	2359
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2360 case '.':
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2361 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2362 // 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	2363
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2364 #if DEBUG_TRACE
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2365 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	2366 #endif
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2367
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2368 if (idx.front ().length () != 1)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2369 error ("invalid meta.class indexing");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2370
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2371 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	2372
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2373 cdef_method meth = find_method (nm);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2374
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2375 if (meth.ok ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2376 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2377 if (! meth.is_static ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2378 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	2379
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2380 octave_value_list args;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2381
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2382 if (type.length () > 1 && idx.size () > 1
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2383 && type[1] == '(')
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2384 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2385 args = *(++(idx.begin ()));
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2386 skip++;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2387 }
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2388
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2389 retval = meth.execute (args, (type.length () > skip
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2390 ? 1 : nargout), true,
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2391 "meta.class");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2392 }
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2393 else
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 cdef_property prop = find_property (nm);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2396
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2397 if (! prop.ok ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2398 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	2399
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2400 if (! prop.is_constant ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2401 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	2402
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2403 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	2404 }
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2405 }
15956 d8553705f8f0 Support calling static methods and getting constant properties. Michael Goffioul <michael.goffioul@gmail.com> parents: 15955 diff changeset	2406 break;
d8553705f8f0 Support calling static methods and getting constant properties. Michael Goffioul <michael.goffioul@gmail.com> parents: 15955 diff changeset	2407
d8553705f8f0 Support calling static methods and getting constant properties. Michael Goffioul <michael.goffioul@gmail.com> parents: 15955 diff changeset	2408 default:
20428 7ac907da9fba Use error() rather than ::error() unless explicitly required. Rik <rik@octave.org> parents: 20193 diff changeset	2409 error ("invalid meta.class indexing");
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2410 break;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2411 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2412
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2413 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	2414 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	2415
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2416 return retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2417 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2418
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2419 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	2420 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	2421 {
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	2422 cdef_manager& cdm
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	2423 = 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	2424
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	2425 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	2426 }
14aa0b5a980c Abstract the meta-protocol layer to use it for other meta objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 15968 diff changeset	2427
14aa0b5a980c Abstract the meta-protocol layer to use it for other meta objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 15968 diff changeset	2428 void
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2429 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	2430 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2431 // Populate the object with default property values
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2432
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2433 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	2434 get ("SuperClasses").cell_value ());
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2435
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2436 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	2437 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	2438
50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2439 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	2440 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2441 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	2442 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2443 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	2444
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2445 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	2446 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	2447 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	2448 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	2449 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2450 }
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2451
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2452 refcount++;
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2453 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	2454 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2455
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2456 void
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2457 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	2458 const octave_value_list& args)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2459 {
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2460 octave_value_list empty_args;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2461
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2462 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	2463 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2464 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	2465
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2466 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	2467 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2468
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2469 std::string cls_name = get_name ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2470 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	2471
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2472 cdef_method ctor = find_method (ctor_name);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2473
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2474 if (ctor.ok ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2475 {
15968 cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	2476 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	2477 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	2478
cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	2479 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	2480 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	2481
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2482 if (ctor_retval.length () != 1)
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20946 diff changeset	2483 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	2484 ctor_name.c_str ());
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2485
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2486 obj = to_cdef (ctor_retval(0));
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2487 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2488
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2489 obj.mark_as_constructed (wrap ());
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2490 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2491
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2492 octave_value
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2493 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	2494 {
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2495 cdef_object obj = construct_object (args);
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2496
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2497 if (obj.ok ())
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2498 return to_ov (obj);
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2499
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2500 return octave_value ();
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2501 }
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2502
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2503 cdef_object
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2504 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	2505 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2506 if (is_abstract ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2507 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	2508 get_name ().c_str ());
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2509
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2510 cdef_object obj;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2511
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2512 if (is_meta_class ())
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2513 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2514 // 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	2515 // 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	2516
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2517 cdef_class this_cls = wrap ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2518
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2519 static cdef_object empty_class;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2520
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	2521 cdef_manager& cdm
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	2522 = 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	2523
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	2524 if (this_cls == cdm.meta_class ())
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2525 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2526 if (! empty_class.ok ())
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2527 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	2528 obj = empty_class;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2529 }
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	2530 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	2531 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2532 static cdef_property empty_property;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2533
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2534 if (! empty_class.ok ())
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2535 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	2536 if (! empty_property.ok ())
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2537 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	2538 obj = empty_property;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2539 }
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	2540 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	2541 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2542 static cdef_method empty_method;
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 (! empty_class.ok ())
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2545 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	2546 if (! empty_method.ok ())
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2547 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	2548 obj = empty_method;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2549 }
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	2550 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	2551 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2552 static cdef_package empty_package;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2553
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2554 if (! empty_package.ok ())
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2555 empty_package = cdm.make_package ("");
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2556 obj = empty_package;
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2557 }
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2558 else
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2559 panic_impossible ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2560
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2561 return obj;
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2562 }
15870 2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	2563 else
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2564 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2565 if (is_handle_class ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2566 obj = cdef_object (new handle_cdef_object ());
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2567 else
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2568 obj = cdef_object (new value_cdef_object ());
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2569 obj.set_class (wrap ());
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2570
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2571 initialize_object (obj);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2572
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2573 run_constructor (obj, args);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2574
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2575 return obj;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2576 }
15913 8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2577
8521321604df Initial support for object array semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15911 diff changeset	2578 return cdef_object ();
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2579 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2580
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2581 static octave_value
23533 8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2582 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	2583 octave::tree_classdef_attribute *t)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2584 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	2585 octave::tree_expression *expr = t->expression ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	2586
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	2587 if (expr)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2588 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	2589 if (expr->is_identifier ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2590 {
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	2591 std::string s = expr->name ();
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2592
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2593 if (s == "public")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2594 return std::string ("public");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2595 else if (s == "protected")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2596 return std::string ("protected");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2597 else if (s == "private")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2598 return std::string ("private");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2599 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2600
23533 8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2601 return tw.evaluate (expr);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2602 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2603 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2604 return octave_value (true);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2605 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2606
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21127 diff changeset	2607 template <typename T>
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2608 static std::string
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23445 diff changeset	2609 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	2610 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2611 if (v.is_string ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2612 return v.string_value ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2613 else if (t->expression ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2614 return t->expression ()->original_text ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2615 else
23829 01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23826 diff changeset	2616 return "true";
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2617 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2618
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2619 cdef_class
23533 8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2620 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	2621 octave::tree_classdef *t, bool is_at_folder)
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2622 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2623 cdef_class retval;
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	2624 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	2625
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2626 // Class creation
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2627
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	2628 class_name = full_class_name = t->ident ()->name ();
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	2629 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	2630 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	2631
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2632 #if DEBUG_TRACE
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2633 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	2634 #endif
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2635
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2636 std::list<cdef_class> slist;
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 if (t->superclass_list ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2639 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2640 for (auto& scls : (*t->superclass_list ()))
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2641 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2642 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	2643
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2644 #if DEBUG_TRACE
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2645 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	2646 #endif
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2647
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2648 cdef_class sclass = lookup_class (sclass_name);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2649
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2650 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	2651 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	2652 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	2653
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2654 slist.push_back (sclass);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2655 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2656 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2657
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2658 cdef_manager& cdm
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2659 = octave::__get_cdef_manager__ ("cdef_class::make_meta_class");
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2660
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2661 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	2662
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	2663 // Package owning this class
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	2664
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	2665 if (! t->package_name ().empty ())
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	2666 {
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	2667 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	2668
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2669 if (pack.ok ())
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	2670 retval.put ("ContainingPackage", to_ov (pack));
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	2671 }
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	2672
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2673 // Class attributes
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2674
23533 8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2675 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	2676
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2677 if (t->attribute_list ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2678 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2679 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	2680 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2681 std::string aname = attr->ident ()->name ();
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	2682 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	2683
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2684 #if DEBUG_TRACE
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2685 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	2686 << 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	2687 #endif
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2688
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2689 retval.put (aname, avalue);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2690 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2691 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2692
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23445 diff changeset	2693 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	2694
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2695 if (b)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2696 {
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21724 diff changeset	2697 // 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	2698 // later on when creating properties.
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2699
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2700 std::map<std::string, octave_value> get_methods;
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2701 std::map<std::string, octave_value> set_methods;
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2702
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2703 // Method blocks
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2704
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2705 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	2706
23533 8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2707 octave::load_path& lp = interp.get_load_path ();
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	2708
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2709 for (auto& mb_p : mb_list)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2710 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2711 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	2712
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2713 #if DEBUG_TRACE
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2714 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	2715 #endif
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2716
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2717 // Method attributes
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2718
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2719 if (mb_p->attribute_list ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2720 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2721 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	2722 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2723 std::string aname = attr_p->ident ()->name ();
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	2724 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	2725
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2726 #if DEBUG_TRACE
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2727 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	2728 << 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	2729 << std::endl;
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2730 #endif
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2731
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2732 amap[aname] = avalue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2733 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2734 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2735
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2736 // Methods
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2737
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2738 if (mb_p->element_list ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2739 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2740 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	2741 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2742 std::string mname = mtd.function_value ()->name ();
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2743 std::string mprefix = mname.substr (0, 4);
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2744
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2745 if (mprefix == "get.")
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2746 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	2747 make_fcn_handle (mtd, full_class_name + '>' + mname);
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2748 else if (mprefix == "set.")
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2749 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	2750 make_fcn_handle (mtd, full_class_name + '>' + mname);
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2751 else
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2752 {
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2753 cdef_method meth = cdm.make_method (retval, mname, mtd);
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2754
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2755 #if DEBUG_TRACE
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2756 std::cerr << (mname == class_name ? "constructor"
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2757 : "method")
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2758 << ": " << mname << std::endl;
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2759 #endif
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2760
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2761 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	2762 meth.put (attrnm_val.first, attrnm_val.second);
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2763
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2764 retval.install_method (meth);
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2765 }
15869 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 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2769
18263 b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2770 if (is_at_folder)
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2771 {
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2772 // 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	2773 // 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	2774 //
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2775 // 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	2776 // 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	2777 // 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	2778
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	2779 std::list<std::string> external_methods
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	2780 = 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	2781
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2782 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	2783 {
21578 683a1beee538 maint: Use "FIXME:" for all code blocks needing further attention. Rik <rik@octave.org> parents: 21574 diff changeset	2784 // 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	2785 // defined in the classdef file?
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2786
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2787 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	2788 && ! 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	2789 {
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2790 // 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	2791 // method is loaded.
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2792 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	2793
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2794 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	2795
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2796 cdef_method meth
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2797 = 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	2798
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2799 retval.install_method (meth);
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2800 }
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2801 }
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2802 }
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	2803
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2804 // Property blocks
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2805
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2806 // 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	2807 // 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	2808 // 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	2809 // value expressions.
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2810
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2811 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	2812 = b->properties_list ();
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 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 (auto& pb_p : pb_list)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2815 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2816 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	2817
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2818 #if DEBUG_TRACE
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2819 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	2820 #endif
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2821
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2822 // Property attributes
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2823
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2824 if (pb_p->attribute_list ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 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 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	2827 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2828 std::string aname = attr_p->ident ()->name ();
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	2829 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	2830
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2831 #if DEBUG_TRACE
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2832 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	2833 << 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	2834 << std::endl;
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2835 #endif
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2836
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2837 if (aname == "Access")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2838 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2839 amap["GetAccess"] = avalue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2840 amap["SetAccess"] = avalue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2841 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2842 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2843 amap[aname] = avalue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2844 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2845 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2846
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2847 // Properties
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2848
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2849 if (pb_p->element_list ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2850 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2851 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	2852 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2853 std::string prop_name = prop_p->ident ()->name ();
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2854
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2855 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	2856
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2857 #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	2858 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	2859 << std::endl;
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2860 #endif
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2861
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	2862 octave::tree_expression *expr = prop_p->expression ();
c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23345 diff changeset	2863 if (expr)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2864 {
23533 8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	2865 octave_value pvalue = tw.evaluate (expr);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2866
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2867 #if DEBUG_TRACE
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2868 std::cerr << "property default: "
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2869 << 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	2870 << std::endl;
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2871 #endif
1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	2872
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2873 prop.put ("DefaultValue", pvalue);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2874 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2875
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2876 // 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	2877 // 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	2878 // cdef_property methods.
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2879
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	2880 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	2881 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	2882
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21724 diff changeset	2883 // 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	2884 // 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	2885 // 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	2886 // defined property.
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2887
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2888 std::map<std::string, octave_value>::iterator git =
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2889 get_methods.find (prop_name);
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2890
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2891 if (git != get_methods.end ())
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2892 {
18462 00ba456b9aa8 Fix dispatch class of property accessor methods. Michael Goffioul <michael.goffioul@gmail.com> parents: 18441 diff changeset	2893 make_function_of_class (retval, git->second);
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2894 prop.put ("GetMethod", git->second);
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2895 get_methods.erase (git);
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2896 }
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2897
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2898 std::map<std::string, octave_value>::iterator sit =
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2899 set_methods.find (prop_name);
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2900
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2901 if (sit != set_methods.end ())
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2902 {
18462 00ba456b9aa8 Fix dispatch class of property accessor methods. Michael Goffioul <michael.goffioul@gmail.com> parents: 18441 diff changeset	2903 make_function_of_class (retval, sit->second);
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2904 prop.put ("SetMethod", sit->second);
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2905 set_methods.erase (sit);
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2906 }
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16696 diff changeset	2907
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2908 retval.install_property (prop);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2909 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2910 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2911 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2912 }
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2913
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2914 return retval;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2915 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2916
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2917 octave_function*
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2918 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	2919 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23445 diff changeset	2920 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	2921
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2922 return p;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2923 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2924
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2925 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	2926 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	2927 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	2928 const std::string& who)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2929 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2930 octave_value retval;
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2931
15968 cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	2932 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	2933 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	2934
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2935 if (! obj.is_constructed ())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2936 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2937 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	2938
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2939 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	2940 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	2941 cls.get_name ().c_str ());
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2942 }
19597 db92e7e28e1f strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19343 diff changeset	2943
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2944 octave_value get_fcn = get ("GetMethod");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2945
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2946 // 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	2947
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23576 diff changeset	2948 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	2949 retval = obj.get (get ("Name").string_value ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2950 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2951 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2952 octave_value_list args;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2953
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2954 args(0) = to_ov (obj);
19597 db92e7e28e1f strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19343 diff changeset	2955
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23503 diff changeset	2956 args = octave::feval (get_fcn, args, 1);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2957
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2958 retval = args(0);
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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2961 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2962 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2963
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 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	2965 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	2966 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	2967 {
cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	2968 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	2969 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	2970
cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	2971 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	2972 }
cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	2973
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2974 bool
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2975 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	2976 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2977 // FIXME: implement
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2978 return false;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2979 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2980
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2981 void
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2982 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	2983 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	2984 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	2985 const std::string& who)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2986 {
15968 cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	2987 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	2988 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	2989
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2990 if (! obj.is_constructed ())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2991 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2992 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	2993
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2994 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	2995 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	2996 cls.get_name ().c_str ());
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2997 }
19597 db92e7e28e1f strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19343 diff changeset	2998
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2999 octave_value set_fcn = get ("SetMethod");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3000
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23576 diff changeset	3001 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	3002 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	3003 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3004 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3005 octave_value_list args;
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 args(0) = to_ov (obj);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3008 args(1) = val;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3009
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23503 diff changeset	3010 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	3011
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3012 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	3013 {
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3014 if (args (0).is_classdef_object ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3015 {
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3016 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	3017
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3018 obj = new_obj;
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3019 }
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3020 else
c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3021 ::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	3022 get_name ().c_str ());
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3023 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3024 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3025 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3026
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3027 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	3028 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	3029 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3030 cdef_class cls (to_cdef (get ("DefiningClass")));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3031
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20979 diff changeset	3032 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	3033 get_name (), false);
15869 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 return false;
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
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3038 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	3039 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	3040 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3041 cdef_class cls (to_cdef (get ("DefiningClass")));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3042
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20979 diff changeset	3043 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	3044 get_name (), true);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3045
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3046 return false;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3047 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3048
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3049 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3050 cdef_method::cdef_method_rep::check_method (void)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3051 {
18263 b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3052 if (is_external ())
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3053 {
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3054 if (is_dummy_method (function))
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3055 {
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	3056 octave::load_path& lp
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	3057 = 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	3058
18263 b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3059 std::string name = get_name ();
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3060 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	3061 std::string pack_name;
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3062
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3063 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	3064
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3065 if (pos != std::string::npos)
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3066 {
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3067 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	3068 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	3069 }
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3070
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3071 std::string dir_name;
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	3072 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	3073 dir_name, pack_name);
18263 b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3074
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3075 if (! file_name.empty ())
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3076 {
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23652 diff changeset	3077 octave_value ov_fcn
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23652 diff changeset	3078 = 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	3079 dispatch_type, pack_name);
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23652 diff changeset	3080
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23652 diff changeset	3081 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	3082 {
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23652 diff changeset	3083 function = ov_fcn;
18263 b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3084
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3085 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	3086 }
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3087 }
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3088 }
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3089 else
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3090 {
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3091 // 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	3092 }
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3093
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	3094 if (is_dummy_method (function))
20428 7ac907da9fba Use error() rather than ::error() unless explicitly required. Rik <rik@octave.org> parents: 20193 diff changeset	3095 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	3096 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	3097 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3098 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3099
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3100 octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3101 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	3102 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	3103 const std::string& who)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3104 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3105 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3106
15968 cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	3107 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	3108 err_method_access (who, wrap ());
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3109
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3110 if (get ("Abstract").bool_value ())
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3111 error ("%s: cannot execute abstract method",
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	3112 get ("Name").string_value ().c_str ());
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3113
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3114 check_method ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3115
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3116 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	3117 retval = octave::feval (function, args, nargout);
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3118
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3119 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3120 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3121
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3122 octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3123 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	3124 const octave_value_list& args,
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	3125 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	3126 const std::string& who)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3127 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3128 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3129
15968 cdeb6eb656be Move property/method access check down to cdef_property/cdef_method classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 15958 diff changeset	3130 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	3131 err_method_access (who, wrap ());
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3132
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3133 if (get ("Abstract").bool_value ())
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3134 error ("%s: cannot execute abstract method",
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	3135 get ("Name").string_value ().c_str ());
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3136
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3137 check_method ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3138
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3139 if (function.is_defined ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3140 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3141 octave_value_list new_args;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3142
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3143 new_args.resize (args.length () + 1);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3144
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3145 new_args(0) = to_ov (obj);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3146 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	3147 new_args(i+1) = args(i);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3148
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23503 diff changeset	3149 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	3150 }
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3151
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3152 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3153 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3154
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3155 bool
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	3156 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	3157 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	3158 if (function.is_function())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	3159 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	3160
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	3161 return false;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	3162 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	3163
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	3164 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	3165 cdef_method::cdef_method_rep::check_access (void) const
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3166 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3167 cdef_class cls (to_cdef (get ("DefiningClass")));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	3168
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3169 return ::check_access (cls, get ("Access"), get_name ());
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3170 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3171
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3172 octave_value_list
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3173 cdef_method::cdef_method_rep::meta_subsref
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3174 (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	3175 int nargout)
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3176 {
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3177 octave_value_list retval;
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3178
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3179 switch (type[0])
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3180 {
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3181 case '(':
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	3182 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	3183 break;
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3184
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3185 default:
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3186 error ("invalid meta.method indexing");
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3187 break;
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3188 }
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3189
20563 c1a6c31ac29a eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3190 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	3191 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	3192
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3193 return retval;
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3194 }
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3195
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3196 static cdef_package
24100 4d9ceaf17dda return empty matrix if meta..fromName fails (bug #52096) Piotr Held <pjheld@gmail.com>* parents: 23865 diff changeset	3197 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	3198 bool load_if_not_found = true)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3199 {
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3200 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	3201
24100 4d9ceaf17dda return empty matrix if meta..fromName fails (bug #52096) Piotr Held <pjheld@gmail.com>* parents: 23865 diff changeset	3202 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	3203 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3204
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3205 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3206 package_fromName (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3207 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3208 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3209
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3210 if (args.length () != 1)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3211 error ("fromName: invalid number of parameters");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3212
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3213 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	3214
24100 4d9ceaf17dda return empty matrix if meta..fromName fails (bug #52096) Piotr Held <pjheld@gmail.com>* parents: 23865 diff changeset	3215 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	3216
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3217 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3218 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3219
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3220 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3221 package_get_classes (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3222 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3223 octave_value_list retval (1, Matrix ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3224
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3225 if (args.length () == 1 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3226 && args(0).class_name () == "meta.package")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3227 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3228 cdef_package pack (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3229
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3230 retval(0) = pack.get_classes ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3231 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3232
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3233 return retval;
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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3236 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3237 package_get_functions (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3238 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3239 octave_value_list retval (1, Matrix ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3240
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3241 if (args.length () == 0 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3242 && args(0).class_name () == "meta.package")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3243 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3244 cdef_package pack (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3245
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3246 retval(0) = pack.get_functions ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3247 }
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 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3250 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3251
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3252 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3253 package_get_packages (const octave_value_list& args, int /* nargout */)
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 octave_value_list retval (1, Matrix ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3256
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3257 if (args.length () == 0 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3258 && args(0).class_name () == "meta.package")
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 cdef_package pack (to_cdef (args(0)));
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 retval(0) = pack.get_packages ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3263 }
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 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3266 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3267
16690 1c45e22fc444 Implement meta.package.getAllPackages() method. Michael Goffioul <michael.goffioul@gmail.com> parents: 16689 diff changeset	3268 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	3269 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	3270 const octave_value_list& /* args /, int / nargout */)
16690 1c45e22fc444 Implement meta.package.getAllPackages() method. Michael Goffioul <michael.goffioul@gmail.com> parents: 16689 diff changeset	3271 {
1c45e22fc444 Implement meta.package.getAllPackages() method. Michael Goffioul <michael.goffioul@gmail.com> parents: 16689 diff changeset	3272 std::map<std::string, cdef_package> toplevel_packages;
1c45e22fc444 Implement meta.package.getAllPackages() method. Michael Goffioul <michael.goffioul@gmail.com> parents: 16689 diff changeset	3273
23533 8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	3274 octave::load_path& lp = interp.get_load_path ();
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	3275
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	3276 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	3277
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3278 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	3279
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3280 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	3281
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	3282 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	3283 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	3284
1c45e22fc444 Implement meta.package.getAllPackages() method. Michael Goffioul <michael.goffioul@gmail.com> parents: 16689 diff changeset	3285 Cell c (toplevel_packages.size (), 1);
1c45e22fc444 Implement meta.package.getAllPackages() method. Michael Goffioul <michael.goffioul@gmail.com> parents: 16689 diff changeset	3286
1c45e22fc444 Implement meta.package.getAllPackages() method. Michael Goffioul <michael.goffioul@gmail.com> parents: 16689 diff changeset	3287 int i = 0;
1c45e22fc444 Implement meta.package.getAllPackages() method. Michael Goffioul <michael.goffioul@gmail.com> parents: 16689 diff changeset	3288
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22868 diff changeset	3289 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	3290 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	3291
1c45e22fc444 Implement meta.package.getAllPackages() method. Michael Goffioul <michael.goffioul@gmail.com> parents: 16689 diff changeset	3292 return octave_value_list (octave_value (c));
1c45e22fc444 Implement meta.package.getAllPackages() method. Michael Goffioul <michael.goffioul@gmail.com> parents: 16689 diff changeset	3293 }
1c45e22fc444 Implement meta.package.getAllPackages() method. Michael Goffioul <michael.goffioul@gmail.com> parents: 16689 diff changeset	3294
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3295 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3296 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	3297 const std::string& nm)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3298 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3299 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	3300
b18b7e560236 More flexible refcount to account for owned back-references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15910 diff changeset	3301 member_count++;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3302 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3303
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3304 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3305 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	3306 const std::string& nm)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3307 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3308 function_map[nm] = fcn;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3309 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3310
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3311 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3312 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	3313 const std::string& nm)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3314 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3315 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	3316
b18b7e560236 More flexible refcount to account for owned back-references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15910 diff changeset	3317 member_count++;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3318 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3319
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21127 diff changeset	3320 template <typename T1, typename T2>
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3321 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3322 map2Cell (const std::map<T1, T2>& m)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3323 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3324 Cell retval (1, m.size ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3325 int i = 0;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3326
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3327 for (typename std::map<T1, T2>::const_iterator it = m.begin ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3328 it != m.end (); ++it, ++i)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3329 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3330 retval(i) = to_ov (it->second);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3331 }
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 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3334 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3335
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3336 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3337 cdef_package::cdef_package_rep::get_classes (void) const
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3338 { return map2Cell (class_map); }
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 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3341 cdef_package::cdef_package_rep::get_functions (void) const
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3342 { return map2Cell (function_map); }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3343
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3344 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3345 cdef_package::cdef_package_rep::get_packages (void) const
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3346 { return map2Cell (package_map); }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3347
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3348 octave_value
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3349 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	3350 {
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23693 diff changeset	3351 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	3352
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23683 diff changeset	3353 octave::symbol_table& symtab
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3354 = octave::__get_symbol_table__ ("cdef_package::cdef_package_rep::find");
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3355
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3356 return symtab.find (symbol_name, octave_value_list (), true, false);
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3357 }
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3358
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3359 octave_value_list
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3360 cdef_package::cdef_package_rep::meta_subsref
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3361 (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	3362 int nargout)
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3363 {
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3364 octave_value_list retval;
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3365
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3366 switch (type[0])
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3367 {
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3368 case '.':
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3369 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3370 if (idx.front ().length () != 1)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3371 error ("invalid meta.package indexing");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3372
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3373 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	3374
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	3375 #if DEBUG_TRACE
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3376 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	3377 #endif
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3378
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3379 octave_value o = find (nm);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3380
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3381 if (! o.is_defined ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3382 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	3383 nm.c_str (), get_name ().c_str ());
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3384
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3385 if (o.is_function ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3386 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23445 diff changeset	3387 octave_function *fcn = o.function_value ();
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3388
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3389 // 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	3390 // 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	3391 // 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	3392 // "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	3393 // function call at this stage.
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3394
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3395 if (type.size () > 1
23503 6a2fed2d39ac improve some function names John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	3396 && ! fcn->accepts_postfix_index (type[1]))
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3397 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3398 octave_value_list tmp_args;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3399
23501 1ee4b394a687 use feval instead of do_multi_index_op John W. Eaton <jwe@octave.org> parents: 23476 diff changeset	3400 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	3401 }
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3402 else
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3403 retval(0) = o;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3404
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3405 if (type.size () > 1 && idx.size () > 1)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3406 retval = retval(0).next_subsref (nargout, type,
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3407 idx, 1);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3408 }
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3409 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	3410 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	3411 else
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3412 retval(0) = o;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3413 }
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3414 break;
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3415
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3416 default:
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3417 error ("invalid meta.package indexing");
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3418 break;
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3419 }
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3420
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3421 return retval;
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3422 }
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3423
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3424 void
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3425 cdef_package::cdef_package_rep::meta_release (void)
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3426 {
16689 04e110438873 Expose builtin meta.* classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 16684 diff changeset	3427 // 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	3428 // could still be referenced by classes or sub-packages?
04e110438873 Expose builtin meta.* classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 16684 diff changeset	3429 // 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	3430 // match the one already referenced by those classes or
04e110438873 Expose builtin meta.* classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 16684 diff changeset	3431 // sub-packages.
04e110438873 Expose builtin meta.* classes. Michael Goffioul <michael.goffioul@gmail.com> parents: 16684 diff changeset	3432
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3433 cdef_manager& cdm
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3434 = 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	3435
24541 3d1b40992075 Don't unregister 'meta' package in meta_release (Bug #52111) Piotr Held <pjheld@gmail.com> parents: 24540 diff changeset	3436 // 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	3437 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	3438 cdm.unregister_package (wrap ());
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3439 }
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3440
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3441 //----------------------------------------------------------------------------
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	3442
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24539 diff changeset	3443 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	3444 : 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	3445 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	3446 m_meta_package (), m_meta ()
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3447 {
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24539 diff changeset	3448 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	3449
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24539 diff changeset	3450 octave_classdef::register_type (ti);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3451
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3452 // bootstrap
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3453 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	3454
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3455 m_meta_class = make_meta_class ("meta.class", tmp_handle);
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3456
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3457 tmp_handle.set_class (m_meta_class);
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3458 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	3459
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3460 // meta classes
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3461 m_meta_property = make_meta_class ("meta.property", tmp_handle);
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3462
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3463 m_meta_method = make_meta_class ("meta.method", tmp_handle);
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3464
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3465 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	3466
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3467 cdef_class tmp_meta_event
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3468 = 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	3469
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3470 cdef_class tmp_meta_dynproperty
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3471 = make_meta_class ("meta.dynamicproperty", tmp_handle);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3472
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3473 // meta.class properties
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3474 m_meta_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3475 (make_attribute (m_meta_class, "Abstract"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3476
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3477 m_meta_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3478 (make_attribute (m_meta_class, "ConstructOnLoad"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3479
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3480 m_meta_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3481 (make_property (m_meta_class, "ContainingPackage"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3482
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3483 m_meta_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3484 (make_property (m_meta_class, "Description"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3485
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3486 m_meta_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3487 (make_property (m_meta_class, "DetailedDescription"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3488
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3489 m_meta_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3490 (make_property (m_meta_class, "Events"));
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_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3493 (make_attribute (m_meta_class, "HandleCompatible"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3494
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3495 m_meta_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3496 (make_attribute (m_meta_class, "Hidden"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3497
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3498 m_meta_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3499 (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	3500 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	3501 "meta.class>get.InferiorClasses"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3502 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3503
24539 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_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	3506 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	3507 "meta.class>get.Methods"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3508 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3509
24539 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, "MethodList",
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3512 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	3513 "meta.class>get.MethodList"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3514 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3515
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3516 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	3517
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3518 m_meta_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3519 (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	3520 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	3521 "meta.class>get.Properties"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3522 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3523
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3524 m_meta_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3525 (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	3526 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	3527 "meta.class>get.PropertyList"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3528 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3529
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3530 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	3531
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3532 m_meta_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3533 (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	3534 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	3535 "meta.class>get.SuperClasses"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3536 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3537
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3538 m_meta_class.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3539 (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	3540 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	3541 "meta.class>get.SuperClassList"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3542 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3543
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3544 // meta.class methods
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3545 m_meta_class.install_method
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3546 (make_method (m_meta_class, "fromName", class_fromName, "public", true));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3547
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3548 m_meta_class.install_method
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3549 (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	3550 false));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3551
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3552 m_meta_class.install_method
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3553 (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	3554 false));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3555
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3556 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	3557 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	3558 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	3559 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	3560 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	3561 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	3562
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3563 // meta.method properties
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3564 m_meta_method.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3565 (make_attribute (m_meta_method, "Abstract"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3566
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3567 m_meta_method.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3568 (make_attribute (m_meta_method, "Access"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3569
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3570 m_meta_method.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3571 (make_attribute (m_meta_method, "DefiningClass"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3572
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3573 m_meta_method.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3574 (make_attribute (m_meta_method, "Description"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3575
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3576 m_meta_method.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3577 (make_attribute (m_meta_method, "DetailedDescription"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3578
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3579 m_meta_method.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3580 (make_attribute (m_meta_method, "Hidden"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3581
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3582 m_meta_method.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3583 (make_attribute (m_meta_method, "Name"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3584
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3585 m_meta_method.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3586 (make_attribute (m_meta_method, "Sealed"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3587
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3588 m_meta_method.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3589 (make_attribute (m_meta_method, "Static"));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3590
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3591 // meta.property properties
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3592 m_meta_property.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3593 (make_attribute (m_meta_property, "Name"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3594
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3595 m_meta_property.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3596 (make_attribute (m_meta_property, "Description"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3597
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3598 m_meta_property.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3599 (make_attribute (m_meta_property, "DetailedDescription"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3600
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3601 m_meta_property.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3602 (make_attribute (m_meta_property, "Abstract"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3603
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3604 m_meta_property.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3605 (make_attribute (m_meta_property, "Constant"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3606
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3607 m_meta_property.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3608 (make_attribute (m_meta_property, "GetAccess"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3609
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3610 m_meta_property.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3611 (make_attribute (m_meta_property, "SetAccess"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3612
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3613 m_meta_property.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3614 (make_attribute (m_meta_property, "Dependent"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3615
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3616 m_meta_property.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3617 (make_attribute (m_meta_property, "Transient"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3618
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, "Hidden"));
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, "GetObservable"));
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, "SetObservable"));
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, "GetMethod"));
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, "SetMethod"));
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, "DefiningClass"));
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_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	3639 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	3640 "meta.property>get.DefaultValue"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3641 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3642
24539 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, "HasDefault"));
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3645
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3646 // meta.property events
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3647 // FIXME: add events
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3648
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3649 // handle methods
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3650
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3651 tmp_handle.install_method
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3652 (make_method (tmp_handle, "delete", handle_delete));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3653
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3654 // meta.package properties
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3655
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3656 m_meta_package.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3657 (make_attribute (m_meta_package, "Name"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3658
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3659 m_meta_package.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3660 (make_property (m_meta_package, "ContainingPackage"));
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3661
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3662 m_meta_package.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3663 (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	3664 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	3665 "meta.package>get.ClassList"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3666 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3667
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3668 m_meta_package.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3669 (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	3670 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	3671 "meta.package>get.Classes"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3672 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3673
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3674 m_meta_package.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3675 (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	3676 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	3677 "meta.package>get.FunctionList"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3678 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3679
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3680 m_meta_package.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3681 (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	3682 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	3683 "meta.package>get.Functions"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3684 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3685
24539 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, "PackageList",
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3688 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	3689 "meta.package>get.PackageList"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3690 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3691
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3692 m_meta_package.install_property
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3693 (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	3694 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	3695 "meta.package>get.Packages"),
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3696 "public", Matrix (), "private"));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3697
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3698 m_meta_package.install_method
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3699 (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	3700 "public", true));
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3701
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3702 m_meta_package.install_method
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3703 (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	3704 "public", true));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3705
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3706 // create "meta" package
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3707 cdef_package package_meta
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3708 = m_meta
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3709 = make_package ("meta");
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3710
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3711 package_meta.install_class (m_meta_class, "class");
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3712 package_meta.install_class (m_meta_property, "property");
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3713 package_meta.install_class (m_meta_method, "method");
4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3714 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	3715 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	3716 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	3717
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23683 diff changeset	3718 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	3719
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3720 // 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	3721 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	3722 ("meta.class",
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3723 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	3724
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3725 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	3726 ("meta.method",
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3727 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	3728
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3729 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	3730 ("meta.property",
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3731 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	3732
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3733 symtab.install_built_in_function
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3734 ("meta.package",
24539 4e2ca22b3cf9 refactor cdef_manager John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3735 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	3736
24542 d6f06eeb8917 Don't install meta.event and meta.dynproperty in the symbol table. Piotr Held <pjheld@gmail.com> parents: 24541 diff changeset	3737 // 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	3738 // 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	3739
d6f06eeb8917 Don't install meta.event and meta.dynproperty in the symbol table. Piotr Held <pjheld@gmail.com> parents: 24541 diff changeset	3740 // 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	3741 // ("meta.event",
d6f06eeb8917 Don't install meta.event and meta.dynproperty in the symbol table. Piotr Held <pjheld@gmail.com> parents: 24541 diff changeset	3742 // 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	3743
d6f06eeb8917 Don't install meta.event and meta.dynproperty in the symbol table. Piotr Held <pjheld@gmail.com> parents: 24541 diff changeset	3744 // 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	3745 // ("meta.dynproperty",
d6f06eeb8917 Don't install meta.event and meta.dynproperty in the symbol table. Piotr Held <pjheld@gmail.com> parents: 24541 diff changeset	3746 // 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	3747 }
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3748
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3749 cdef_class
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3750 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	3751 bool load_if_not_found)
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3752 {
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3753 std::map<std::string, cdef_class>::iterator it = m_all_classes.find (name);
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3754
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3755 if (it == m_all_classes.end ())
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3756 {
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3757 if (load_if_not_found)
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3758 {
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3759 octave_value ov_cls;
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3760
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3761 size_t pos = name.rfind ('.');
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3762
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3763 if (pos == std::string::npos)
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3764 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23683 diff changeset	3765 octave::symbol_table& symtab
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3766 = octave::__get_symbol_table__ ("cdef_manager::find_class");
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3767
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3768 ov_cls = symtab.find (name);
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3769 }
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3770 else
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3771 {
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3772 std::string pack_name = name.substr (0, pos);
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3773
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3774 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	3775
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3776 if (pack.ok ())
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3777 ov_cls = pack.find (name.substr (pos+1));
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3778 }
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3779
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3780 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	3781 it = m_all_classes.find (name);
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3782 }
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
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3785 if (it == m_all_classes.end ())
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3786 {
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3787 if (error_if_not_found)
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	3788 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	3789 }
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3790 else
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3791 {
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3792 cdef_class cls = it->second;
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3793
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3794 if (! cls.is_builtin ())
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3795 cls = lookup_class (cls);
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3796
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3797 if (cls.ok ())
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18520 diff changeset	3798 return cls;
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3799 else
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3800 m_all_classes.erase (it);
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3801 }
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3802
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3803 return cdef_class ();
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3804 }
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3805
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3806 octave_function *
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3807 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	3808 const std::string& class_name)
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3809 {
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23450 diff changeset	3810 octave_function *retval = nullptr;
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3811
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3812 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	3813
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3814 if (cls.ok ())
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3815 {
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3816 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	3817
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3818 if (meth.ok ())
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3819 retval = new octave_classdef_meta (meth);
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
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3822 return retval;
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
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3825 cdef_package
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3826 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	3827 bool load_if_not_found)
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 cdef_package retval;
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3830
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3831 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	3832 = m_all_packages.find (name);
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3833
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3834 if (it != m_all_packages.end ())
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3835 {
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3836 retval = it->second;
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3837
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3838 if (! retval.ok ())
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3839 error ("invalid package `%s'", name.c_str ());
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3840 }
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3841 else
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3842 {
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	3843 octave::load_path& lp
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3844 = octave::__get_load_path__ ("cdef_manager::find_package");
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	3845
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	3846 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	3847 {
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3848 size_t pos = name.find ('.');
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3849
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3850 if (pos == std::string::npos)
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20979 diff changeset	3851 retval = make_package (name, "");
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3852 else
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3853 {
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3854 std::string parent_name = name.substr (0, pos);
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3855
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3856 retval = make_package (name, parent_name);
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3857 }
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3858 }
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3859 else if (error_if_not_found)
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3860 error ("unknown package `%s'", name.c_str ());
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3861 }
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3862
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3863 return retval;
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3864 }
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3865
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3866 octave_function *
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	3867 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	3868 {
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23450 diff changeset	3869 octave_function *retval = nullptr;
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3870
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	3871 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	3872
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3873 if (pack.ok ())
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16048 diff changeset	3874 retval = new octave_classdef_meta (pack);
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3875
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3876 return retval;
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3877 }
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3878
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3879 //----------------------------------------------------------------------------
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15986 diff changeset	3880
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	3881 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	3882 doc: /* -- texinfo --
22299 9fc91bb2aec3 doc: grammarcheck documentation for 4.2 release. Rik <rik@octave.org> parents: 22297 diff changeset	3883 @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	3884 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	3885 @end deftypefn */)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3886 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20743 diff changeset	3887 if (args.length () != 1)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3888 print_usage ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3889
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20743 diff changeset	3890 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	3891
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20743 diff changeset	3892 return to_ov (lookup_package (cname));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3893 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3894
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3895 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	3896 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	3897 @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	3898 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	3899 @end deftypefn */)
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	3900 {
21127 df7891224709 maint: Use "return ovl (...)" in DEFUN macros. Rik <rik@octave.org> parents: 21121 diff changeset	3901 return ovl (new octave_classdef_superclass_ref (args));
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	3902 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	3903
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3904 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	3905 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	3906 @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	3907 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	3908 @end deftypefn */)
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	3909 {
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	3910 #if DEBUG_TRACE
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	3911 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	3912 << args(0).string_value () << ')'
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	3913 << std::endl;
19031 1f36981ab323 allow debugging messages in classdef code to be disabled John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	3914 #endif
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	3915
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20743 diff changeset	3916 if (args.length () != 1)
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	3917 print_usage ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	3918
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20743 diff changeset	3919 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	3920
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20743 diff changeset	3921 return to_ov (lookup_class (cls));
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	3922 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	3923
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	3924 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	3925 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	3926 @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	3927 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	3928 @end deftypefn */)
15897 a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	3929 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20743 diff changeset	3930 if (args.length () != 1)
15897 a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	3931 print_usage ();
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	3932
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20743 diff changeset	3933 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	3934
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20743 diff changeset	3935 return to_ov (obj.get_class ());
15897 a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	3936 }
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	3937
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3938 /*
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3939 ;;; Local Variables: ***
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3940 ;;; mode: C++ ***
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3941 ;;; End: ***
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3942 */

Mercurial > octave

annotate libinterp/octave-value/ov-classdef.cc @ 25367:0548e32e6b27 stable