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

annotate libinterp/octave-value/cdef-class.cc @ 27371:fcaecdbc8d8a

don't use visitor pattern for expression evaluation (bug #56752) Although it is desirable to have all parse tree evaluation functions grouped together in a single file, using the visitor pattern can be inefficient, especially when the visitor function is small and the extra levels of indirection and virtual function resolution can take more time than the evaluation function itself (evaluation of constants, for example). For all classes derived from tree_expression, introduce new evaluate and evaluate_n methods. Use those instead of visit_CLASS functions to perform expression evaluation. Results are now returned directly from the evaluation functions instead of storing them in the tree_evaluator object. Files affected: cdef-class.cc, oct-parse.yy, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-cbinop.cc, pt-cbinop.h, pt-cell.cc, pt-cell.h, pt-classdef.cc, pt-classdef.h, pt-colon.cc, pt-colon.h, pt-const.h, pt-eval.cc, pt-eval.h, pt-exp.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-loop.cc, pt-mat.cc, pt-mat.h, pt-select.cc, pt-tm-const.cc, pt-unop.cc, and pt-unop.h.

author	John W. Eaton <jwe@octave.org>
date	Fri, 30 Aug 2019 15:02:14 -0400
parents	db687716fed6
children	c98953e85220

rev	line source
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1 /*
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	2
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	3 Copyright (C) 2012-2019 Michael Goffioul
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	4
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	5 This file is part of Octave.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	6
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	7 Octave is free software: you can redistribute it and/or modify it
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	8 under the terms of the GNU General Public License as published by
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	9 the Free Software Foundation, either version 3 of the License, or
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	10 (at your option) any later version.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	11
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	15 GNU General Public License for more details.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	16
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	17 You should have received a copy of the GNU General Public License
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	18 along with Octave; see the file COPYING. If not, see
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	19 <https://www.gnu.org/licenses/>.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	20
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	21 */
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	22
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	23 #if defined (HAVE_CONFIG_H)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	24 # include "config.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	25 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	26
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	27 #include <algorithm>
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	28 #include <iomanip>
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	29
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	30 #include "cdef-class.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	31 #include "cdef-manager.h"
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	32 #include "cdef-method.h"
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	33 #include "cdef-package.h"
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	34 #include "cdef-property.h"
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	35 #include "cdef-utils.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	36 #include "errwarn.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	37 #include "interpreter-private.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	38 #include "interpreter.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	39 #include "load-path.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	40 #include "ov-builtin.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	41 #include "ov-classdef.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	42 #include "ov-fcn-handle.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	43 #include "ov-usr-fcn.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	44 #include "parse.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	45 #include "pt-assign.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	46 #include "pt-classdef.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	47 #include "pt-eval.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	48 #include "pt-idx.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	49 #include "pt-misc.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	50 #include "pt-stmt.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	51 #include "pt-walk.h"
27189 946c6f117091 use dummy stack frame when creating meta class (bug #55766 and #55768) John W. Eaton <jwe@octave.org> parents: 27146 diff changeset	52 #include "unwind-prot.h"
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	53
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	54 // Define to 1 to enable debugging statements.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	55 #define DEBUG_TRACE 0
27146 c776d553c19e * cdef-class.cc: Repair debug code. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26975 diff changeset	56 #if DEBUG_TRACE
c776d553c19e * cdef-class.cc: Repair debug code. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26975 diff changeset	57 # include <iostream>
c776d553c19e * cdef-class.cc: Repair debug code. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26975 diff changeset	58 #endif
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	59
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	60 namespace octave
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	61 {
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	62 static octave_value
26847 8bd9fd99c12a lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802) John W. Eaton <jwe@octave.org> parents: 26774 diff changeset	63 make_fcn_handle (interpreter& interp, const octave_value& fcn,
8bd9fd99c12a lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802) John W. Eaton <jwe@octave.org> parents: 26774 diff changeset	64 const std::string& nm)
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	65 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	66 octave_value retval;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	67
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	68 if (fcn.is_defined ())
26847 8bd9fd99c12a lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802) John W. Eaton <jwe@octave.org> parents: 26774 diff changeset	69 {
8bd9fd99c12a lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802) John W. Eaton <jwe@octave.org> parents: 26774 diff changeset	70 tree_evaluator& tw = interp.get_evaluator ();
8bd9fd99c12a lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802) John W. Eaton <jwe@octave.org> parents: 26774 diff changeset	71
8bd9fd99c12a lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802) John W. Eaton <jwe@octave.org> parents: 26774 diff changeset	72 symbol_scope curr_scope = tw.get_current_scope ();
8bd9fd99c12a lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802) John W. Eaton <jwe@octave.org> parents: 26774 diff changeset	73
8bd9fd99c12a lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802) John W. Eaton <jwe@octave.org> parents: 26774 diff changeset	74 retval = octave_value (new octave_fcn_handle (curr_scope, fcn, nm));
8bd9fd99c12a lazily evaluate fcn handles; fix overload resolution (bug #29447, bug #31821, bug #48802) John W. Eaton <jwe@octave.org> parents: 26774 diff changeset	75 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	76
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	77 return retval;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	78 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	79
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	80 cdef_class::cdef_class_rep::cdef_class_rep (const std::list<cdef_class>& superclasses)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	81 : cdef_meta_object_rep (), member_count (0), handle_class (false),
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	82 object_count (0), meta (false)
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	83 {
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	84 put ("SuperClasses", to_ov (superclasses));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	85 implicit_ctor_list = superclasses;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	86 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	87
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	88 cdef_method
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	89 cdef_class::cdef_class_rep::find_method (const std::string& nm, bool local)
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	90 {
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	91 auto it = method_map.find (nm);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	92
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	93 if (it == method_map.end ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	94 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	95 // FIXME: look into class directory
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	96 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	97 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	98 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	99 cdef_method& meth = it->second;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	100
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	101 // FIXME: check if method reload needed
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	102
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	103 if (meth.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	104 return meth;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	105 }
26773 a95887edd55e style fixes for classdef classes John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	106
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	107 if (! local)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	108 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	109 // Look into superclasses
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	110
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	111 Cell super_classes = get ("SuperClasses").cell_value ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	112
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	113 for (int i = 0; i < super_classes.numel (); i++)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	114 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	115 cdef_class cls = lookup_class (super_classes(i));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	116
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	117 cdef_method meth = cls.find_method (nm);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	118
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	119 if (meth.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	120 return meth;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	121 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	122 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	123
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	124 return cdef_method ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	125 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	126
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	127 class ctor_analyzer : public tree_walker
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	128 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	129 public:
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	130
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	131 ctor_analyzer (void) = delete;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	132
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	133 ctor_analyzer (const std::string& ctor, const std::string& obj)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	134 : tree_walker (), who (ctor), obj_name (obj) { }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	135
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	136 ctor_analyzer (const ctor_analyzer&) = delete;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	137
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	138 ctor_analyzer& operator = (const ctor_analyzer&) = delete;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	139
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	140 ~ctor_analyzer (void) = default;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	141
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	142 void visit_statement_list (tree_statement_list& t)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	143 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	144 for (const auto& stmt_p : t)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	145 stmt_p->accept (*this);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	146 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	147
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	148 void visit_statement (tree_statement& t)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	149 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	150 if (t.is_expression ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	151 t.expression ()->accept (*this);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	152 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	153
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	154 void visit_simple_assignment (tree_simple_assignment& t)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	155 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	156 t.right_hand_side ()->accept (*this);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	157 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	158
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	159 void visit_multi_assignment (tree_multi_assignment& t)
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	160 {
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	161 t.right_hand_side ()->accept (*this);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	162 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	163
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	164 void visit_index_expression (tree_index_expression& t)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	165 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	166 t.expression ()->accept (*this);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	167 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	168
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	169 std::list<cdef_class> get_constructor_list (void) const
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	170 { return ctor_list; }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	171
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	172 // NO-OP
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	173
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	174 void visit_anon_fcn_handle (tree_anon_fcn_handle&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	175 void visit_argument_list (tree_argument_list&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	176 void visit_binary_expression (tree_binary_expression&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	177 void visit_break_command (tree_break_command&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	178 void visit_colon_expression (tree_colon_expression&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	179 void visit_continue_command (tree_continue_command&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	180 void visit_decl_command (tree_decl_command&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	181 void visit_decl_init_list (tree_decl_init_list&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	182 void visit_decl_elt (tree_decl_elt&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	183 void visit_simple_for_command (tree_simple_for_command&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	184 void visit_complex_for_command (tree_complex_for_command&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	185 void visit_octave_user_script (octave_user_script&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	186 void visit_octave_user_function (octave_user_function&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	187 void visit_function_def (tree_function_def&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	188 void visit_identifier (tree_identifier&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	189 void visit_if_clause (tree_if_clause&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	190 void visit_if_command (tree_if_command&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	191 void visit_if_command_list (tree_if_command_list&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	192 void visit_switch_case (tree_switch_case&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	193 void visit_switch_case_list (tree_switch_case_list&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	194 void visit_switch_command (tree_switch_command&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	195 void visit_matrix (tree_matrix&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	196 void visit_cell (tree_cell&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	197 void visit_no_op_command (tree_no_op_command&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	198 void visit_constant (tree_constant&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	199 void visit_fcn_handle (tree_fcn_handle&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	200 void visit_parameter_list (tree_parameter_list&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	201 void visit_postfix_expression (tree_postfix_expression&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	202 void visit_prefix_expression (tree_prefix_expression&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	203 void visit_return_command (tree_return_command&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	204 void visit_return_list (tree_return_list&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	205 void visit_try_catch_command (tree_try_catch_command&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	206 void visit_unwind_protect_command (tree_unwind_protect_command&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	207 void visit_while_command (tree_while_command&) { }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	208 void visit_do_until_command (tree_do_until_command&) { }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	209
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	210 void visit_superclass_ref (tree_superclass_ref& t)
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	211 {
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	212 if (t.method_name () == obj_name)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	213 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	214 std::string class_name = t.class_name ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	215
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	216 cdef_class cls = lookup_class (class_name, false);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	217
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	218 if (cls.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	219 ctor_list.push_back (cls);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	220 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	221 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	222
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	223 private:
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	224
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	225 // The name of the constructor being analyzed.
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	226 std::string who;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	227
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	228 // The name of the first output argument of the constructor.
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	229 std::string obj_name;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	230
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	231 // The list of superclass constructors that are explicitly called.
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	232 std::list<cdef_class> ctor_list;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	233 };
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	234
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	235 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	236 cdef_class::cdef_class_rep::install_method (const cdef_method& meth)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	237 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	238 method_map[meth.get_name ()] = meth;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	239
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	240 member_count++;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	241
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	242 if (meth.is_constructor ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	243 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	244 // Analyze the constructor code to determine what superclass
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	245 // constructors are called explicitly.
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	246
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	247 octave_function *of = meth.get_function ().function_value (true);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	248
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	249 if (of)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	250 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	251 octave_user_function *uf = of->user_function_value (true);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	252
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	253 if (uf)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	254 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	255 tree_parameter_list *ret_list = uf->return_list ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	256 tree_statement_list *body = uf->body ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	257
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	258 if (! ret_list \|\| ret_list->size () != 1)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	259 error ("%s: invalid constructor output arguments",
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	260 meth.get_name ().c_str ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	261
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	262 std::string obj_name = ret_list->front ()->name ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	263 ctor_analyzer a (meth.get_name (), obj_name);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	264
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	265 body->accept (a);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	266
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	267 std::list<cdef_class> explicit_ctor_list
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	268 = a.get_constructor_list ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	269
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	270 for (const auto& cdef_cls : explicit_ctor_list)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	271 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	272 #if DEBUG_TRACE
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	273 std::cerr << "explicit superclass constructor: "
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	274 << cdef_cls.get_name () << std::endl;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	275 #endif
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	276
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	277 implicit_ctor_list.remove (cdef_cls);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	278 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	279 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	280 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	281 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	282 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	283
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	284 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	285 cdef_class::cdef_class_rep::load_all_methods (void)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	286 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	287 // FIXME: re-scan class directory
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	288 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	289
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	290 Cell
26950 fbb318c371db methods: return classdef constructors in list (bug #55858) John W. Eaton <jwe@octave.org> parents: 26926 diff changeset	291 cdef_class::cdef_class_rep::get_methods (bool include_ctor)
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	292 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	293 std::map<std::string,cdef_method> meths;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	294
26950 fbb318c371db methods: return classdef constructors in list (bug #55858) John W. Eaton <jwe@octave.org> parents: 26926 diff changeset	295 find_methods (meths, false, include_ctor);
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	296
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	297 Cell c (meths.size (), 1);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	298
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	299 int idx = 0;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	300
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	301 for (const auto& nm_mthd : meths)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	302 c(idx++, 0) = to_ov (nm_mthd.second);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	303
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	304 return c;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	305 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	306
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	307 std::map<std::string, cdef_method>
26950 fbb318c371db methods: return classdef constructors in list (bug #55858) John W. Eaton <jwe@octave.org> parents: 26926 diff changeset	308 cdef_class::cdef_class_rep::get_method_map (bool only_inherited,
fbb318c371db methods: return classdef constructors in list (bug #55858) John W. Eaton <jwe@octave.org> parents: 26926 diff changeset	309 bool include_ctor)
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	310 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	311 std::map<std::string, cdef_method> methods;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	312
26950 fbb318c371db methods: return classdef constructors in list (bug #55858) John W. Eaton <jwe@octave.org> parents: 26926 diff changeset	313 find_methods (methods, only_inherited, include_ctor);
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	314
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	315 return methods;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	316 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	317
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	318 void
26950 fbb318c371db methods: return classdef constructors in list (bug #55858) John W. Eaton <jwe@octave.org> parents: 26926 diff changeset	319 cdef_class::cdef_class_rep::find_methods (std::map<std::string, cdef_method>& meths,
fbb318c371db methods: return classdef constructors in list (bug #55858) John W. Eaton <jwe@octave.org> parents: 26926 diff changeset	320 bool only_inherited, bool include_ctor)
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	321 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	322 load_all_methods ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	323
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	324 method_const_iterator it;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	325
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	326 for (it = method_map.begin (); it != method_map.end (); ++it)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	327 {
26950 fbb318c371db methods: return classdef constructors in list (bug #55858) John W. Eaton <jwe@octave.org> parents: 26926 diff changeset	328 if (include_ctor \|\| ! it->second.is_constructor ())
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	329 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	330 std::string nm = it->second.get_name ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	331
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	332 if (meths.find (nm) == meths.end ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	333 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	334 if (only_inherited)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	335 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	336 octave_value acc = it->second.get ("Access");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	337
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	338 if (! acc.is_string ()
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	339 \|\| acc.string_value () == "private")
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	340 continue;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	341 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	342
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	343 meths[nm] = it->second;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	344 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	345 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	346 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	347
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	348 // Look into superclasses
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	349
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	350 Cell super_classes = get ("SuperClasses").cell_value ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	351
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	352 for (int i = 0; i < super_classes.numel (); i++)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	353 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	354 cdef_class cls = lookup_class (super_classes(i));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	355
26950 fbb318c371db methods: return classdef constructors in list (bug #55858) John W. Eaton <jwe@octave.org> parents: 26926 diff changeset	356 cls.get_rep ()->find_methods (meths, true, false);
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	357 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	358 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	359
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	360 cdef_property
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	361 cdef_class::cdef_class_rep::find_property (const std::string& nm)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	362 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	363 auto it = property_map.find (nm);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	364
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	365 if (it != property_map.end ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	366 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	367 cdef_property& prop = it->second;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	368
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	369 if (prop.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	370 return prop;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	371 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	372
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	373 // Look into superclasses
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	374
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	375 Cell super_classes = get ("SuperClasses").cell_value ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	376
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	377 for (int i = 0; i < super_classes.numel (); i++)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	378 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	379 cdef_class cls = lookup_class (super_classes(i));
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	380
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	381 cdef_property prop = cls.find_property (nm);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	382
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	383 if (prop.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	384 return prop;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	385 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	386
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	387 return cdef_property ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	388 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	389
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	390 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	391 cdef_class::cdef_class_rep::install_property (const cdef_property& prop)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	392 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	393 property_map[prop.get_name ()] = prop;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	394
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	395 member_count++;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	396 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	397
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	398 Cell
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	399 cdef_class::cdef_class_rep::get_properties (int mode)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	400 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	401 std::map<std::string,cdef_property> props;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	402
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	403 props = get_property_map (mode);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	404
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	405 Cell c (props.size (), 1);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	406
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	407 int idx = 0;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	408
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	409 for (const auto& pname_prop : props)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	410 c(idx++, 0) = to_ov (pname_prop.second);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	411
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	412 return c;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	413 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	414
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	415 std::map<std::string, cdef_property>
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	416 cdef_class::cdef_class_rep::get_property_map (int mode)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	417 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	418 std::map<std::string,cdef_property> props;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	419
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	420 find_properties (props, mode);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	421
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	422 return props;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	423 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	424
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	425 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	426 cdef_class::cdef_class_rep::find_properties (std::map<std::string,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	427 cdef_property>& props,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	428 int mode)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	429 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	430 property_const_iterator it;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	431
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	432 for (it = property_map.begin (); it != property_map.end (); ++it)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	433 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	434 std::string nm = it->second.get_name ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	435
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	436 if (props.find (nm) == props.end ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	437 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	438 if (mode == property_inherited)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	439 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	440 octave_value acc = it->second.get ("GetAccess");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	441
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	442 if (! acc.is_string ()
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	443 \|\| acc.string_value () == "private")
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	444 continue;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	445 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	446
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	447 props[nm] = it->second;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	448 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	449 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	450
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	451 // Look into superclasses
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	452
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	453 Cell super_classes = get ("SuperClasses").cell_value ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	454
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	455 for (int i = 0; i < super_classes.numel (); i++)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	456 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	457 cdef_class cls = lookup_class (super_classes(i));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	458
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	459 cls.get_rep ()->find_properties (props,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	460 (mode == property_all
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	461 ? property_all
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	462 : property_inherited));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	463 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	464 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	465
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	466 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	467 cdef_class::cdef_class_rep::find_names (std::set<std::string>& names,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	468 bool all)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	469 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	470 load_all_methods ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	471
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	472 for (const auto& cls_fnmap : method_map)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	473 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	474 if (! cls_fnmap.second.is_constructor ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	475 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	476 std::string nm = cls_fnmap.second.get_name ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	477
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	478 if (! all)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	479 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	480 octave_value acc = cls_fnmap.second.get ("Access");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	481
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	482 if (! acc.is_string()
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	483 \|\| acc.string_value () != "public")
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	484 continue;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	485 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	486
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	487 names.insert (nm);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	488 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	489 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	490
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	491 for (const auto& pname_prop : property_map)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	492 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	493 std::string nm = pname_prop.second.get_name ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	494
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	495 if (! all)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	496 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	497 octave_value acc = pname_prop.second.get ("GetAccess");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	498
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	499 if (! acc.is_string()
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	500 \|\| acc.string_value () != "public")
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	501 continue;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	502 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	503
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	504 names.insert (nm);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	505 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	506
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	507 // Look into superclasses
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	508
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	509 Cell super_classes = get ("SuperClasses").cell_value ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	510
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	511 for (int i = 0; i < super_classes.numel (); i++)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	512 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	513 cdef_class cls = lookup_class (super_classes(i));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	514
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	515 cls.get_rep ()->find_names (names, all);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	516 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	517 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	518
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	519 string_vector
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	520 cdef_class::cdef_class_rep::get_names (void)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	521 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	522 std::set<std::string> names;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	523
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	524 find_names (names, false);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	525
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	526 string_vector v (names);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	527
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	528 return v.sort (true);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	529 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	530
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	531 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	532 cdef_class::cdef_class_rep::delete_object (const cdef_object& obj)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	533 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	534 cdef_method dtor = find_method ("delete");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	535
26926 71724787d972 don't call inherited delete methods (bug #53956) John W. Eaton <jwe@octave.org> parents: 26847 diff changeset	536 // FIXME: would it be better to tell find_method above to not find
71724787d972 don't call inherited delete methods (bug #53956) John W. Eaton <jwe@octave.org> parents: 26847 diff changeset	537 // overloaded functions?
71724787d972 don't call inherited delete methods (bug #53956) John W. Eaton <jwe@octave.org> parents: 26847 diff changeset	538
71724787d972 don't call inherited delete methods (bug #53956) John W. Eaton <jwe@octave.org> parents: 26847 diff changeset	539 if (dtor.ok () && dtor.is_defined_in_class (get_name ()))
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	540 dtor.execute (obj, octave_value_list (), 0, true, "destructor");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	541
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	542 // FIXME: should we destroy corresponding properties here?
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	543
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	544 // Call "delete" in super classes
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	545
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	546 Cell super_classes = get ("SuperClasses").cell_value ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	547
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	548 for (int i = 0; i < super_classes.numel (); i++)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	549 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	550 cdef_class cls = lookup_class (super_classes(i));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	551
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	552 if (cls.get_name () != "handle")
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	553 cls.delete_object (obj);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	554 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	555 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	556
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	557 octave_value_list
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	558 cdef_class::cdef_class_rep::meta_subsref (const std::string& type,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	559 const std::list<octave_value_list>& idx,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	560 int nargout)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	561 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	562 size_t skip = 1;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	563
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	564 octave_value_list retval;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	565
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	566 switch (type[0])
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	567 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	568 case '(':
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	569 // Constructor call
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	570
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	571 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	572 std::cerr << "constructor" << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	573 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	574
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	575 retval(0) = construct (idx.front ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	576 break;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	577
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	578 case '.':
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	579 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	580 // Static method, constant (or property?)
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	581
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	582 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	583 std::cerr << "static method/property" << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	584 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	585
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	586 if (idx.front ().length () != 1)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	587 error ("invalid meta.class indexing");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	588
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	589 std::string nm = idx.front ()(0).xstring_value ("invalid meta.class indexing, expected a method or property name");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	590
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	591 cdef_method meth = find_method (nm);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	592
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	593 if (meth.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	594 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	595 if (! meth.is_static ())
27216 823b4bcf79fc unless necessary for formatting or code, use ' instead of ` John W. Eaton <jwe@octave.org> parents: 27189 diff changeset	596 error ("method '%s' is not static", nm.c_str ());
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	597
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	598 octave_value_list args;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	599
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	600 if (type.length () > 1 && idx.size () > 1 && type[1] == '(')
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	601 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	602 args = *(++(idx.begin ()));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	603 skip++;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	604 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	605
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	606 retval = meth.execute (args, (type.length () > skip
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	607 ? 1 : nargout), true,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	608 "meta.class");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	609 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	610 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	611 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	612 cdef_property prop = find_property (nm);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	613
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	614 if (! prop.ok ())
27216 823b4bcf79fc unless necessary for formatting or code, use ' instead of ` John W. Eaton <jwe@octave.org> parents: 27189 diff changeset	615 error ("no such method or property '%s'", nm.c_str ());
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	616
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	617 if (! prop.is_constant ())
27216 823b4bcf79fc unless necessary for formatting or code, use ' instead of ` John W. Eaton <jwe@octave.org> parents: 27189 diff changeset	618 error ("property '%s' is not constant", nm.c_str ());
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	619
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	620 retval(0) = prop.get_value (true, "meta.class");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	621 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	622 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	623 break;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	624
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	625 default:
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	626 error ("invalid meta.class indexing");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	627 break;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	628 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	629
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	630 if (type.length () > skip && idx.size () > skip && ! retval.empty ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	631 retval = retval(0).next_subsref (nargout, type, idx, skip);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	632
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	633 return retval;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	634 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	635
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	636 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	637 cdef_class::cdef_class_rep::meta_release (void)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	638 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	639 cdef_manager& cdm
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	640 = __get_cdef_manager__ ("cdef_class::cdef_class_rep::meta_release");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	641
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	642 cdm.unregister_class (wrap ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	643 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	644
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	645 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	646 cdef_class::cdef_class_rep::initialize_object (cdef_object& obj)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	647 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	648 // Populate the object with default property values
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	649
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27216 diff changeset	650 std::list<cdef_class> super_classes
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27216 diff changeset	651 = lookup_classes (get ("SuperClasses").cell_value ());
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	652
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	653 for (auto& cls : super_classes)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	654 cls.initialize_object (obj);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	655
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	656 for (const auto& pname_prop : property_map)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	657 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	658 if (! pname_prop.second.get ("Dependent").bool_value ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	659 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	660 octave_value pvalue = pname_prop.second.get ("DefaultValue");
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	661
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	662 if (pvalue.is_defined ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	663 obj.put (pname_prop.first, pvalue);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	664 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	665 obj.put (pname_prop.first, octave_value (Matrix ()));
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	666 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	667 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	668
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	669 m_count++;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	670 obj.mark_for_construction (cdef_class (this));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	671 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	672
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	673 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	674 cdef_class::cdef_class_rep::run_constructor (cdef_object& obj,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	675 const octave_value_list& args)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	676 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	677 octave_value_list empty_args;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	678
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	679 for (const auto& cls : implicit_ctor_list)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	680 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	681 cdef_class supcls = lookup_class (cls);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	682
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	683 supcls.run_constructor (obj, empty_args);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	684 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	685
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	686 std::string cls_name = get_name ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	687 std::string ctor_name = get_base_name (cls_name);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	688
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	689 cdef_method ctor = find_method (ctor_name);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	690
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	691 if (ctor.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	692 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	693 octave_value_list ctor_args (args);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	694 octave_value_list ctor_retval;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	695
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	696 ctor_args.prepend (to_ov (obj));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	697 ctor_retval = ctor.execute (ctor_args, 1, true, "constructor");
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	698
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	699 if (ctor_retval.length () != 1)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	700 error ("%s: invalid number of output arguments for classdef constructor",
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	701 ctor_name.c_str ());
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	702
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	703 obj = to_cdef (ctor_retval(0));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	704 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	705
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	706 obj.mark_as_constructed (wrap ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	707 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	708
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	709 octave_value
26975 de826e69a5ea make breakpoints in classdef methods work (bug #45404, bug #46451) John W. Eaton <jwe@octave.org> parents: 26950 diff changeset	710 cdef_class::cdef_class_rep::get_method (const std::string& name) const
de826e69a5ea make breakpoints in classdef methods work (bug #45404, bug #46451) John W. Eaton <jwe@octave.org> parents: 26950 diff changeset	711 {
de826e69a5ea make breakpoints in classdef methods work (bug #45404, bug #46451) John W. Eaton <jwe@octave.org> parents: 26950 diff changeset	712 auto p = method_map.find (name);
de826e69a5ea make breakpoints in classdef methods work (bug #45404, bug #46451) John W. Eaton <jwe@octave.org> parents: 26950 diff changeset	713
de826e69a5ea make breakpoints in classdef methods work (bug #45404, bug #46451) John W. Eaton <jwe@octave.org> parents: 26950 diff changeset	714 if (p == method_map.end ())
de826e69a5ea make breakpoints in classdef methods work (bug #45404, bug #46451) John W. Eaton <jwe@octave.org> parents: 26950 diff changeset	715 return octave_value ();
de826e69a5ea make breakpoints in classdef methods work (bug #45404, bug #46451) John W. Eaton <jwe@octave.org> parents: 26950 diff changeset	716
de826e69a5ea make breakpoints in classdef methods work (bug #45404, bug #46451) John W. Eaton <jwe@octave.org> parents: 26950 diff changeset	717 return p->second.get_function ();
de826e69a5ea make breakpoints in classdef methods work (bug #45404, bug #46451) John W. Eaton <jwe@octave.org> parents: 26950 diff changeset	718 }
de826e69a5ea make breakpoints in classdef methods work (bug #45404, bug #46451) John W. Eaton <jwe@octave.org> parents: 26950 diff changeset	719
de826e69a5ea make breakpoints in classdef methods work (bug #45404, bug #46451) John W. Eaton <jwe@octave.org> parents: 26950 diff changeset	720
de826e69a5ea make breakpoints in classdef methods work (bug #45404, bug #46451) John W. Eaton <jwe@octave.org> parents: 26950 diff changeset	721 octave_value
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	722 cdef_class::cdef_class_rep::construct (const octave_value_list& args)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	723 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	724 cdef_object obj = construct_object (args);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	725
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	726 if (obj.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	727 return to_ov (obj);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	728
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	729 return octave_value ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	730 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	731
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	732 cdef_object
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	733 cdef_class::cdef_class_rep::construct_object (const octave_value_list& args)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	734 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	735 if (is_abstract ())
27216 823b4bcf79fc unless necessary for formatting or code, use ' instead of ` John W. Eaton <jwe@octave.org> parents: 27189 diff changeset	736 error ("cannot instantiate object for abstract class '%s'",
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	737 get_name ().c_str ());
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	738
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	739 cdef_object obj;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	740
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	741 if (is_meta_class ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	742 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	743 // This code path is only used to create empty meta objects
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	744 // as filler for the empty values within a meta object array.
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	745
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	746 cdef_class this_cls = wrap ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	747
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	748 static cdef_object empty_class;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	749
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	750 cdef_manager& cdm
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	751 = __get_cdef_manager__ ("cdef_class::cdef_class_rep::construct_object");
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	752
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	753 if (this_cls == cdm.meta_class ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	754 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	755 if (! empty_class.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	756 empty_class = cdm.make_class ("", std::list<cdef_class> ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	757 obj = empty_class;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	758 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	759 else if (this_cls == cdm.meta_property ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	760 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	761 static cdef_property empty_property;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	762
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	763 if (! empty_class.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	764 empty_class = cdm.make_class ("", std::list<cdef_class> ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	765 if (! empty_property.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	766 empty_property = cdm.make_property (empty_class, "");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	767 obj = empty_property;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	768 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	769 else if (this_cls == cdm.meta_method ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	770 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	771 static cdef_method empty_method;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	772
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	773 if (! empty_class.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	774 empty_class = cdm.make_class ("", std::list<cdef_class> ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	775 if (! empty_method.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	776 empty_method = cdm.make_method (empty_class, "", octave_value ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	777 obj = empty_method;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	778 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	779 else if (this_cls == cdm.meta_package ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	780 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	781 static cdef_package empty_package;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	782
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	783 if (! empty_package.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	784 empty_package = cdm.make_package ("");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	785 obj = empty_package;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	786 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	787 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	788 panic_impossible ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	789
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	790 return obj;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	791 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	792 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	793 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	794 if (is_handle_class ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	795 obj = cdef_object (new handle_cdef_object ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	796 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	797 obj = cdef_object (new value_cdef_object ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	798 obj.set_class (wrap ());
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	799
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	800 initialize_object (obj);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	801
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	802 run_constructor (obj, args);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	803
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	804 return obj;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	805 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	806
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	807 return cdef_object ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	808 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	809
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	810 static octave_value
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	811 compute_attribute_value (tree_evaluator& tw,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	812 tree_classdef_attribute *t)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	813 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	814 tree_expression *expr = t->expression ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	815
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	816 if (expr)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	817 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	818 if (expr->is_identifier ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	819 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	820 std::string s = expr->name ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	821
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	822 if (s == "public")
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	823 return std::string ("public");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	824 else if (s == "protected")
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	825 return std::string ("protected");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	826 else if (s == "private")
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	827 return std::string ("private");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	828 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	829
27371 fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752) John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	830 return expr->evaluate (tw);
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	831 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	832 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	833 return octave_value (true);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	834 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	835
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	836 template <typename T>
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	837 static std::string
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	838 attribute_value_to_string (T *t, octave_value v)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	839 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	840 if (v.is_string ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	841 return v.string_value ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	842 else if (t->expression ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	843 return t->expression ()->original_text ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	844 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	845 return "true";
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	846 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	847
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	848 cdef_class
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	849 cdef_class::make_meta_class (interpreter& interp,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	850 tree_classdef *t, bool is_at_folder)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	851 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	852 cdef_class retval;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	853 std::string class_name, full_class_name;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	854
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	855 // Class creation
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	856
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	857 class_name = full_class_name = t->ident ()->name ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	858 if (! t->package_name ().empty ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	859 full_class_name = t->package_name () + '.' + full_class_name;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	860
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	861 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	862 std::cerr << "class: " << full_class_name << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	863 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	864
27189 946c6f117091 use dummy stack frame when creating meta class (bug #55766 and #55768) John W. Eaton <jwe@octave.org> parents: 27146 diff changeset	865 // Push a dummy scope frame on the call stack that corresponds to
946c6f117091 use dummy stack frame when creating meta class (bug #55766 and #55768) John W. Eaton <jwe@octave.org> parents: 27146 diff changeset	866 // the scope that was used when parsing classdef object. Without
946c6f117091 use dummy stack frame when creating meta class (bug #55766 and #55768) John W. Eaton <jwe@octave.org> parents: 27146 diff changeset	867 // this, we may pick up stray values from the current scope when
946c6f117091 use dummy stack frame when creating meta class (bug #55766 and #55768) John W. Eaton <jwe@octave.org> parents: 27146 diff changeset	868 // evaluating expressions found in things like attribute lists.
946c6f117091 use dummy stack frame when creating meta class (bug #55766 and #55768) John W. Eaton <jwe@octave.org> parents: 27146 diff changeset	869
946c6f117091 use dummy stack frame when creating meta class (bug #55766 and #55768) John W. Eaton <jwe@octave.org> parents: 27146 diff changeset	870 unwind_protect frame;
946c6f117091 use dummy stack frame when creating meta class (bug #55766 and #55768) John W. Eaton <jwe@octave.org> parents: 27146 diff changeset	871
946c6f117091 use dummy stack frame when creating meta class (bug #55766 and #55768) John W. Eaton <jwe@octave.org> parents: 27146 diff changeset	872 tree_evaluator& tw = interp.get_evaluator ();
946c6f117091 use dummy stack frame when creating meta class (bug #55766 and #55768) John W. Eaton <jwe@octave.org> parents: 27146 diff changeset	873
946c6f117091 use dummy stack frame when creating meta class (bug #55766 and #55768) John W. Eaton <jwe@octave.org> parents: 27146 diff changeset	874 tw.push_dummy_scope (full_class_name);
946c6f117091 use dummy stack frame when creating meta class (bug #55766 and #55768) John W. Eaton <jwe@octave.org> parents: 27146 diff changeset	875 frame.add_method (tw, &octave::tree_evaluator::pop_scope);
946c6f117091 use dummy stack frame when creating meta class (bug #55766 and #55768) John W. Eaton <jwe@octave.org> parents: 27146 diff changeset	876
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	877 std::list<cdef_class> slist;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	878
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	879 if (t->superclass_list ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	880 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	881 for (auto& scls : (*t->superclass_list ()))
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	882 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	883 std::string sclass_name = (scls)->class_name ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	884
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	885 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	886 std::cerr << "superclass: " << sclass_name << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	887 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	888
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	889 cdef_class sclass = lookup_class (sclass_name);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	890
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	891 if (sclass.get ("Sealed").bool_value ())
27216 823b4bcf79fc unless necessary for formatting or code, use ' instead of ` John W. Eaton <jwe@octave.org> parents: 27189 diff changeset	892 error ("'%s' cannot inherit from '%s', because it is sealed",
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	893 full_class_name.c_str (), sclass_name.c_str ());
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	894
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	895 slist.push_back (sclass);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	896 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	897 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	898
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	899 cdef_manager& cdm = __get_cdef_manager__ ("cdef_class::make_meta_class");
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	900
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	901 retval = cdm.make_class (full_class_name, slist);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	902
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	903 // Package owning this class
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	904
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	905 if (! t->package_name ().empty ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	906 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	907 cdef_package pack = cdm.find_package (t->package_name ());
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	908
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	909 if (pack.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	910 retval.put ("ContainingPackage", to_ov (pack));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	911 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	912
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	913 // Class attributes
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	914
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	915 if (t->attribute_list ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	916 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	917 for (const auto& attr : (*t->attribute_list ()))
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	918 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	919 std::string aname = attr->ident ()->name ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	920 octave_value avalue = compute_attribute_value (tw, attr);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	921
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	922 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	923 std::cerr << "class attribute: " << aname << " = "
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	924 << attribute_value_to_string (attr, avalue) << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	925 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	926
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	927 retval.put (aname, avalue);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	928 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	929 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	930
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	931 tree_classdef_body *b = t->body ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	932
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	933 if (b)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	934 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	935 // Keep track of the get/set accessor methods. They will be used
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	936 // later on when creating properties.
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	937
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	938 std::map<std::string, octave_value> get_methods;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	939 std::map<std::string, octave_value> set_methods;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	940
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	941 // Method blocks
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	942
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	943 std::list<tree_classdef_methods_block *> mb_list = b->methods_list ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	944
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	945 load_path& lp = interp.get_load_path ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	946
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	947 for (auto& mb_p : mb_list)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	948 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	949 std::map<std::string, octave_value> amap;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	950
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	951 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	952 std::cerr << "method block" << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	953 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	954
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	955 // Method attributes
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	956
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	957 if (mb_p->attribute_list ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	958 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	959 for (auto& attr_p : *mb_p->attribute_list ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	960 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	961 std::string aname = attr_p->ident ()->name ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	962 octave_value avalue = compute_attribute_value (tw, attr_p);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	963
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	964 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	965 std::cerr << "method attribute: " << aname << " = "
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	966 << attribute_value_to_string (attr_p, avalue)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	967 << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	968 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	969
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	970 amap[aname] = avalue;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	971 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	972 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	973
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	974 // Methods
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	975
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	976 if (mb_p->element_list ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	977 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	978 for (auto& mtd : *mb_p->element_list ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	979 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	980 std::string mname = mtd.function_value ()->name ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	981 std::string mprefix = mname.substr (0, 4);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	982
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	983 if (mprefix == "get.")
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	984 get_methods[mname.substr (4)]
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	985 = make_fcn_handle (interp, mtd,
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	986 full_class_name + '>' + mname);
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	987 else if (mprefix == "set.")
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	988 set_methods[mname.substr (4)]
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	989 = make_fcn_handle (interp, mtd,
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	990 full_class_name + '>' + mname);
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	991 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	992 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	993 cdef_method meth = cdm.make_method (retval, mname, mtd);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	994
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	995 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	996 std::cerr << (mname == class_name ? "constructor"
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	997 : "method")
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	998 << ": " << mname << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	999 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1000
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1001 for (auto& attrnm_val : amap)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1002 meth.put (attrnm_val.first, attrnm_val.second);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1003
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1004 retval.install_method (meth);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1005 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1006 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1007 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1008 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1009
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1010 if (is_at_folder)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1011 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1012 // Look for all external methods visible on octave path at the
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1013 // time of loading of the class.
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1014 //
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1015 // FIXME: This is an "extension" to Matlab behavior, which only looks
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1016 // in the @-folder containing the original classdef file. However,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1017 // this is easier to implement it that way at the moment.
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1018
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1019 std::list<std::string> external_methods
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1020 = lp.methods (full_class_name);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1021
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1022 for (const auto& mtdnm : external_methods)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1023 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1024 // FIXME: should we issue a warning if the method is already
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1025 // defined in the classdef file?
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1026
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1027 if (mtdnm != class_name
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1028 && ! retval.find_method (mtdnm, true).ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1029 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1030 // Create a dummy method that is used until the actual
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1031 // method is loaded.
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1032 octave_user_function *fcn = new octave_user_function ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1033
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1034 fcn->stash_function_name (mtdnm);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1035
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1036 cdef_method meth
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1037 = cdm.make_method (retval, mtdnm, octave_value (fcn));
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1038
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1039 retval.install_method (meth);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1040 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1041 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1042 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1043
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1044 // Property blocks
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1045
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1046 // FIXME: default property expression should be able to call static
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1047 // methods of the class being constructed. A restricted CLASSNAME
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1048 // symbol should be added to the scope before evaluating default
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1049 // value expressions.
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1050
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1051 std::list<tree_classdef_properties_block *> pb_list
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1052 = b->properties_list ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1053
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1054 for (auto& pb_p : pb_list)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1055 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1056 std::map<std::string, octave_value> amap;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1057
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1058 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1059 std::cerr << "property block" << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1060 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1061
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1062 // Property attributes
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1063
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1064 if (pb_p->attribute_list ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1065 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1066 for (auto& attr_p : *pb_p->attribute_list ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1067 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1068 std::string aname = attr_p->ident ()->name ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1069 octave_value avalue = compute_attribute_value (tw, attr_p);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1070
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1071 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1072 std::cerr << "property attribute: " << aname << " = "
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1073 << attribute_value_to_string (attr_p, avalue)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1074 << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1075 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1076
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1077 if (aname == "Access")
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1078 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1079 amap["GetAccess"] = avalue;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1080 amap["SetAccess"] = avalue;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1081 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1082 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1083 amap[aname] = avalue;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1084 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1085 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1086
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1087 // Properties
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1088
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1089 if (pb_p->element_list ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1090 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1091 for (auto& prop_p : *pb_p->element_list ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1092 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1093 std::string prop_name = prop_p->ident ()->name ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1094
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1095 cdef_property prop = cdm.make_property (retval, prop_name);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1096
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1097 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1098 std::cerr << "property: " << prop_p->ident ()->name ()
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1099 << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1100 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1101
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1102 tree_expression *expr = prop_p->expression ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1103 if (expr)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1104 {
27371 fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752) John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1105 octave_value pvalue = expr->evaluate (tw);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1106
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1107 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1108 std::cerr << "property default: "
27146 c776d553c19e * cdef-class.cc: Repair debug code. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26975 diff changeset	1109 << attribute_value_to_string (prop_p, pvalue)
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1110 << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1111 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1112
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1113 prop.put ("DefaultValue", pvalue);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1114 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1115
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1116 // Install property attributes. This is done before assigning
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1117 // the property accessors so we can do validation by using
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1118 // cdef_property methods.
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1119
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1120 for (auto& attrnm_val : amap)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1121 prop.put (attrnm_val.first, attrnm_val.second);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1122
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1123 // Install property access methods, if any. Remove the
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1124 // accessor methods from the temporary storage map, so we can
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1125 // detect which ones are invalid and do not correspond to a
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1126 // defined property.
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1127
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1128 auto git = get_methods.find (prop_name);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1129
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1130 if (git != get_methods.end ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1131 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1132 make_function_of_class (retval, git->second);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1133 prop.put ("GetMethod", git->second);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1134 get_methods.erase (git);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1135 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1136
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1137 auto sit = set_methods.find (prop_name);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1138
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1139 if (sit != set_methods.end ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1140 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1141 make_function_of_class (retval, sit->second);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1142 prop.put ("SetMethod", sit->second);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1143 set_methods.erase (sit);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1144 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1145
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1146 retval.install_property (prop);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1147 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1148 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1149 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1150 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1151
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1152 return retval;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1153 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1154
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1155 octave_function*
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1156 cdef_class::get_method_function (const std::string& /* nm */)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1157 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1158 octave_classdef_meta p = new octave_classdef_meta (this);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1159
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1160 return p;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26773 diff changeset	1161 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1162 }

Mercurial > octave

annotate libinterp/octave-value/cdef-class.cc @ 27371:fcaecdbc8d8a